commit f34cd632d777e8f8be2ec1f4f3a0c363a7a6214d
author msarett <msarett@google.com> Wed May 25 10:13:53 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed May 25 10:13:53 2016 -0700
tree 2efd5910300c6e4a47c90e39ba6a7c35cc279d48
parent ab926f0a1bca1c6e17520803d964a0344b4f79b4

Assign sRGB color space to unmarked jpegs and pngs

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2009813003

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

src/codec/SkJpegCodec.cpp

diff --git a/src/codec/SkJpegCodec.cpp b/src/codec/SkJpegCodec.cpp
index 07ece6c..5d24694 100644
--- a/src/codec/SkJpegCodec.cpp
+++ b/src/codec/SkJpegCodec.cpp
@@ -222,11 +222,15 @@
 
         Origin orientation = get_exif_orientation(decoderMgr->dinfo());
         sk_sp<SkColorSpace> colorSpace = get_icc_profile(decoderMgr->dinfo());
+        if (!colorSpace) {
+            // Treat unmarked jpegs as sRGB.
+            colorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
+        }
 
         const int width = decoderMgr->dinfo()->image_width;
         const int height = decoderMgr->dinfo()->image_height;
-        *codecOut = new SkJpegCodec(width, height, info, stream, decoderMgr.release(), colorSpace,
-                orientation);
+        *codecOut = new SkJpegCodec(width, height, info, stream, decoderMgr.release(),
+                std::move(colorSpace), orientation);
     } else {
         SkASSERT(nullptr != decoderMgrOut);
         *decoderMgrOut = decoderMgr.release();
@@ -248,7 +252,7 @@
 
 SkJpegCodec::SkJpegCodec(int width, int height, const SkEncodedInfo& info, SkStream* stream,
         JpegDecoderMgr* decoderMgr, sk_sp<SkColorSpace> colorSpace, Origin origin)
-    : INHERITED(width, height, info, stream, colorSpace, origin)
+    : INHERITED(width, height, info, stream, std::move(colorSpace), origin)
     , fDecoderMgr(decoderMgr)
     , fReadyState(decoderMgr->dinfo()->global_state)
     , fSwizzlerSubset(SkIRect::MakeEmpty())

src/codec/SkPngCodec.cpp

diff --git a/src/codec/SkPngCodec.cpp b/src/codec/SkPngCodec.cpp
index 84d2575..43d1580 100644
--- a/src/codec/SkPngCodec.cpp
+++ b/src/codec/SkPngCodec.cpp
@@ -608,6 +608,11 @@
 
     if (outCodec) {
         sk_sp<SkColorSpace> colorSpace = read_color_space(png_ptr, info_ptr);
+        if (!colorSpace) {
+            // Treat unmarked pngs as sRGB.
+            colorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
+        }
+
         SkEncodedInfo info = SkEncodedInfo::Make(color, alpha, 8);
 
         if (1 == numberPasses) {