commit b44bb31137787b9dcc530d9061e3a08cf261da23
author Brian Osman <brianosman@google.com> Tue Dec 20 15:54:11 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Dec 20 21:34:12 2016 +0000
tree 1a17b6a27cc65f208334bd22dfd2fcffdc907272
parent 5ec9def2dd7bba572398ff2aa9361fbbb3b478ed

Add color space xform to GrMagnifierEffect

Tag helper image as sRGB in magnifier image filter GM, so we can see
this working.

BUG=skia:

Change-Id: I8057dc332d09e1d508ad8462aaf0749b307f480f
Reviewed-on: https://skia-review.googlesource.com/6347
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

gm/imagemagnifier.cpp

diff --git a/gm/imagemagnifier.cpp b/gm/imagemagnifier.cpp
index 88a6d10..888bb5d 100644
--- a/gm/imagemagnifier.cpp
+++ b/gm/imagemagnifier.cpp
@@ -8,6 +8,7 @@
 #include "gm.h"
 #include "SkImageSource.h"
 #include "SkMagnifierImageFilter.h"
+#include "SkPixelRef.h"
 #include "SkRandom.h"
 #include "SkSurface.h"
 
@@ -43,23 +44,25 @@
 #define WIDTH_HEIGHT 256
 
 static sk_sp<SkImage> make_img() {
-    const SkImageInfo info = SkImageInfo::MakeN32Premul(WIDTH_HEIGHT, WIDTH_HEIGHT);
+    SkBitmap bitmap;
+    bitmap.allocN32Pixels(WIDTH_HEIGHT, WIDTH_HEIGHT);
+    SkCanvas canvas(bitmap);
 
-    sk_sp<SkSurface> surf(SkSurface::MakeRaster(info));
-
-    SkCanvas* canvas = surf->getCanvas();
-
-    canvas->clear(0x0);
+    canvas.clear(0x0);
 
     SkPaint paint;
     paint.setColor(SK_ColorBLUE);
 
     for (float pos = 0; pos < WIDTH_HEIGHT; pos += 16) {
-        canvas->drawLine(0, pos, SkIntToScalar(WIDTH_HEIGHT), pos, paint);
-        canvas->drawLine(pos, 0, pos, SkIntToScalar(WIDTH_HEIGHT), paint);
+        canvas.drawLine(0, pos, SkIntToScalar(WIDTH_HEIGHT), pos, paint);
+        canvas.drawLine(pos, 0, pos, SkIntToScalar(WIDTH_HEIGHT), paint);
     }
 
-    return surf->makeImageSnapshot();
+    SkBitmap result;
+    result.setInfo(SkImageInfo::MakeS32(WIDTH_HEIGHT, WIDTH_HEIGHT, kPremul_SkAlphaType));
+    result.setPixelRef(sk_ref_sp(bitmap.pixelRef()), 0, 0);
+
+    return SkImage::MakeFromBitmap(result);
 }
 
 DEF_SIMPLE_GM_BG(imagemagnifier_cropped, canvas, WIDTH_HEIGHT, WIDTH_HEIGHT, SK_ColorBLACK) {