commit d531ca038fac8acb3320a78c393c002ca59768fe
author Matt Sarett <msarett@google.com> Fri Mar 24 16:31:19 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Apr 03 18:32:42 2017 +0000
tree 2d9891fae706bf8aa7972dda94b01cb6a56cf45c
parent 8576014d8a8b799b30dbee4b9d86571fc4781807

Use SkTransferFunctionBehavior in SkImageGenerator

This fixes SkColorSpaceXformCanvas gms that expect
non-linear premuls from the codec.

BUG=skia:

Change-Id: I5dc236d0cd760c23605a26e9c33ddb18955f9231
Reviewed-on: https://skia-review.googlesource.com/10164
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Matt Sarett <msarett@google.com>

src/codec/SkCodecImageGenerator.h

diff --git a/src/codec/SkCodecImageGenerator.h b/src/codec/SkCodecImageGenerator.h
index 727a747..a435205 100644
--- a/src/codec/SkCodecImageGenerator.h
+++ b/src/codec/SkCodecImageGenerator.h
@@ -24,7 +24,9 @@
     SkData* onRefEncodedData(GrContext* ctx) override;
 
     bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, SkPMColor ctable[],
-            int* ctableCount) override;
+                     int* ctableCount) override;
+    bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, const Options& opts)
+                     override;
 
     bool onQueryYUV8(SkYUVSizeInfo*, SkYUVColorSpace*) const override;