Merge "Manual revert of "Decode to sRGB in BitmapFactory""

2016-12-19 22:35:28 +00:00
parent 1f44d3b8f9 8a50364941
commit fa49cc0a03
1 changed files with 1 additions and 1 deletions
--- a/core/jni/android/graphics/BitmapFactory.cpp
+++ b/core/jni/android/graphics/BitmapFactory.cpp
@@ -395,7 +395,7 @@ static jobject doDecode(JNIEnv* env, SkStreamRewindable* stream, jobject padding
    SkAlphaType alphaType = codec->computeOutputAlphaType(requireUnpremultiplied);

    const SkImageInfo decodeInfo = SkImageInfo::Make(size.width(), size.height(),
-            decodeColorType, alphaType, codec->computeOutputColorSpace(decodeColorType));
+            decodeColorType, alphaType);

    // We always decode to sRGB, but only mark the bitmap with a color space if linear
    // blending is enabled.