Use non-linear color spaces for Android decode outputs

BUG=skia:

Change-Id: Ic4bce28f4bc45f73cbfcacc3630140d11fa9c41f
Reviewed-on: https://skia-review.googlesource.com/8530
Reviewed-by: Leon Scroggins <scroggo@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Matt Sarett <msarett@google.com>

1 files changed, 13 insertions, 0 deletions

diff --git a/src/core/SkColorSpace.cpp b/src/core/SkColorSpace.cpp
index 18eede3950..b24a8d6777 100644
--- a/src/core/SkColorSpace.cpp
+++ b/src/core/SkColorSpace.cpp
@@ -297,6 +297,19 @@ bool SkColorSpace::toXYZD50(SkMatrix44* toXYZD50) const {
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
+sk_sp<SkColorSpace> SkColorSpace_Base::makeWithoutFlags() {
+    if (!fFlags) {
+        return sk_ref_sp(this);
+    }
+
+    SkASSERT(Type::kXYZ == this->type());
+    SkColorSpaceTransferFn fn;
+    SkAssertResult(this->onIsNumericalTransferFn(&fn));
+    return SkColorSpace::MakeRGB(fn, *this->toXYZD50(), 0);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
 enum Version {
     k0_Version, // Initial version, header + flags for matrix and profile
 };