commit 7f15b682f4e3e0f61a56d3bbdb8163d3a54b997c
author Matt Sarett <msarett@google.com> Fri Feb 24 17:22:09 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Feb 24 23:13:15 2017 +0000
tree 0810c4c47d1bf33b468b40da6afa02c929e86143
parent 443ec1b794ec5ec8a155a9cdc641e95a95914533

Fix bug handling CMYK images without color profiles

We need the swizzler to convert CMYK->RGB in some
cases where we do have a color xform.

BUG=skia:

Change-Id: Id467ad03df64368fd5a6c3bd5461566582eb492e
Reviewed-on: https://skia-review.googlesource.com/8973
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>

src/codec/SkJpegCodec.h

diff --git a/src/codec/SkJpegCodec.h b/src/codec/SkJpegCodec.h
index b6d7528..0c2f4a1 100644
--- a/src/codec/SkJpegCodec.h
+++ b/src/codec/SkJpegCodec.h
@@ -111,7 +111,8 @@
      */
     bool setOutputColorSpace(const SkImageInfo& dst);
 
-    void initializeSwizzler(const SkImageInfo& dstInfo, const Options& options);
+    void initializeSwizzler(const SkImageInfo& dstInfo, const Options& options,
+                            bool needsCMYKToRGB);
     void allocateStorage(const SkImageInfo& dstInfo);
     int readRows(const SkImageInfo& dstInfo, void* dst, size_t rowBytes, int count, const Options&);