commit 9876ac5b3016e5353c072378ac1545a0a2270757
author msarett <msarett@google.com> Wed Jun 01 14:47:18 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed Jun 01 14:47:18 2016 -0700
tree 2ca6c3c24f94550d2e8c71f2a1b57d0eea5a0f1c
parent 81e4cc7723ea87de8b8917e52cc25f524225fa43

Create SkColorSpaceXform to handle color conversions

Also adds testing of qcms color correction, so we can compare
SkColorSpaceXform outputs to qcms outputs.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1952063002

Committed: https://skia.googlesource.com/skia/+/740cc88ee3d63c75e52d31238f2a32600cc57a8c

Review-Url: https://codereview.chromium.org/1952063002

src/codec/SkJpegCodec.h

diff --git a/src/codec/SkJpegCodec.h b/src/codec/SkJpegCodec.h
index f8cddd0..7aa275c 100644
--- a/src/codec/SkJpegCodec.h
+++ b/src/codec/SkJpegCodec.h
@@ -58,6 +58,8 @@
 
     bool onDimensionsSupported(const SkISize&) override;
 
+    sk_sp<SkData> getICCData() const override { return fICCData; }
+
 private:
 
     /*
@@ -92,7 +94,8 @@
      *                   takes ownership
      */
     SkJpegCodec(int width, int height, const SkEncodedInfo& info, SkStream* stream,
-            JpegDecoderMgr* decoderMgr, sk_sp<SkColorSpace> colorSpace, Origin origin);
+            JpegDecoderMgr* decoderMgr, sk_sp<SkColorSpace> colorSpace, Origin origin,
+            sk_sp<SkData> iccData);
 
     /*
      * Checks if the conversion between the input image and the requested output
@@ -123,6 +126,8 @@
     SkIRect                    fSwizzlerSubset;
     SkAutoTDelete<SkSwizzler>  fSwizzler;
     
+    sk_sp<SkData>              fICCData;
+
     typedef SkCodec INHERITED;
 };