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

Merge "BitmapFactory: Leave the P3 color space on wide gamut bitmaps"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-22 01:46:16 +00:00
committed by Android (Google) Code Review
parent f7d364d820 6c382572e3
commit 0df2b375a3
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -455,10 +455,17 @@ static jobject doDecode(JNIEnv* env, SkStreamRewindable* stream, jobject padding
const SkImageInfo decodeInfo = SkImageInfo::Make(size.width(), size.height(),
decodeColorType, decodeAlphaType, codec->computeOutputColorSpace(decodeColorType));
// When supported by the colorType, we will decode to sRGB (or linear sRGB). However,
// we only want to mark the bitmap as sRGB when linear blending is enabled.
SkImageInfo bitmapInfo = decodeInfo.makeAlphaType(alphaType)
.makeColorSpace(GraphicsJNI::colorSpaceForType(decodeColorType));
SkImageInfo bitmapInfo = decodeInfo.makeAlphaType(alphaType);
// For wide gamut images, we will leave the color space on the SkBitmap. Otherwise,
// use the default.
sk_sp<SkColorSpace> srgb =
SkColorSpace::MakeRGB(SkColorSpace::kSRGB_RenderTargetGamma,
SkColorSpace::kSRGB_Gamut,
SkColorSpace::kNonLinearBlending_ColorSpaceFlag);
if (decodeInfo.colorSpace() == srgb.get()) {
bitmapInfo = bitmapInfo.makeColorSpace(GraphicsJNI::colorSpaceForType(decodeColorType));
}
if (decodeColorType == kGray_8_SkColorType) {
// The legacy implementation of BitmapFactory used kAlpha8 for