commit 9c6645e787669e5af2b9de73d0a6d1cd4d77bbf0
author Mike Klein <mtklein@chromium.org> Wed May 31 08:38:05 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 31 15:59:19 2017 +0000
tree b0aed63163ac1e166b869395916471715b01b55f
parent 2fdc3d56a250e15445ee073ec49981d2c4f94953

assume sRGB transfer function on untagged images

This has been a long time coming.  There are probably one or two more
places we'd want to do this on the CPU side too, but it's a start.

Somewhat seriously, this is my proposed fixed for colorburn +
xfermodes2.  We're not interpreting the red or green images sensibly.

BUG=skia:6680

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

src/shaders/SkImageShader.cpp

diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp
index 751300e..d46d255 100644
--- a/src/shaders/SkImageShader.cpp
+++ b/src/shaders/SkImageShader.cpp
@@ -313,7 +313,7 @@
             case kRGBA_F16_SkColorType:  p->append(SkRasterPipeline::gather_f16,  gather); break;
             default: SkASSERT(false);
         }
-        if (info.gammaCloseToSRGB() && dstCS != nullptr) {
+        if (dstCS && (!info.colorSpace() || info.gammaCloseToSRGB())) {
             p->append_from_srgb(info.alphaType());
         }
     };