From 555ea8e994cede6508a6d8fb6c16f99331b2ed37 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Thu, 25 May 2017 08:58:43 -0400 Subject: [PATCH] bail out of ChooseBitmapXferProc with a color space This fixes the paint-color parts of the gamut GM, and a handful of other similar problems. We'll still memset in the blitter, just after we get in the right gamut. BUG=skia:6679 Change-Id: I2b16259ad689c63ae304fb600802acf9125b8c25 Reviewed-on: https://skia-review.googlesource.com/17922 Reviewed-by: Brian Osman Commit-Queue: Mike Klein --- src/core/SkDraw.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp index 47f6e8bb5d..877563c707 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -98,7 +98,7 @@ static BitmapXferProc ChooseBitmapXferProc(const SkPixmap& dst, const SkPaint& p uint32_t* data) { // todo: we can apply colorfilter up front if no shader, so we wouldn't // need to abort this fastpath - if (paint.getShader() || paint.getColorFilter()) { + if (paint.getShader() || paint.getColorFilter() || dst.colorSpace()) { return nullptr; }