Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use a colorspace when decoding to F16"

Browse Source
This commit is contained in:
TreeHugger Robot
2016-12-22 00:21:36 +00:00
committed by Android (Google) Code Review
parent a663b4bb06 6eebb28b18
commit e0bf3393f0
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/jni/android/graphics/BitmapFactory.cpp
View File

@@ -395,12 +395,9 @@ 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);
decodeColorType, alphaType, GraphicsJNI::colorSpaceForType(decodeColorType));
// We always decode to sRGB, but only mark the bitmap with a color space if linear
// blending is enabled.
SkImageInfo bitmapInfo = decodeInfo.makeColorSpace(
GraphicsJNI::colorSpaceForType(decodeColorType));
SkImageInfo bitmapInfo = decodeInfo;
if (decodeColorType == kGray_8_SkColorType) {
// The legacy implementation of BitmapFactory used kAlpha8 for
// grayscale images (before kGray8 existed). While the codec