commit 09a1c088b407b2cb04b7f41d71b227e7da4757a8
author Matt Sarett <msarett@google.com> Wed Feb 01 15:34:22 2017 -0800
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Feb 02 05:23:40 2017 +0000
tree 842ef5091bf54075470a6c9d97e539b0ee82fae3
parent 0bd699e497819344083df4715928a54a597cd630

Prepare to test all image decode modes to F16

I've only been running F16 tests in "colorImage" mode.
We really should be running our "image" tests to F16 as well - so
they can be tested with scaling, subsets, etc.

This CL fixes bugs so that we can enable those tests.

BUG=skia:

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

dm/DMSrcSink.cpp

diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index cea87f7..ae34f90 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -364,6 +364,13 @@
                     kOpaque_SkAlphaType != decodeInfo->alphaType()) {
                 return false;
             }
+
+            if (kRGBA_F16_SkColorType == canvasColorType) {
+                sk_sp<SkColorSpace> linearSpace =
+                        as_CSB(decodeInfo->colorSpace())->makeLinearGamma();
+                *decodeInfo = decodeInfo->makeColorSpace(std::move(linearSpace));
+            }
+
             *decodeInfo = decodeInfo->makeColorType(canvasColorType);
             break;
     }