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

Merge "Set the color space as nullptr on native bitmaps when sRGB is requested" into oc-dev

Browse Source 
am: e53b00c6d1

Change-Id: I03d0cb5717a0f559890aea201f6d7883c5f6c57f
This commit is contained in:
Romain Guy
2017-04-19 21:46:11 +00:00
committed by android-build-merger
parent 4d0f44d7a7 e53b00c6d1
commit 09071f9bdf
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/java/android/graphics/Bitmap.java
View File

@@ -996,7 +996,9 @@ public final class Bitmap implements Parcelable {
}
Bitmap bm;
if (config != Config.ARGB_8888) {
// nullptr color spaces have a particular meaning in native and are interpreted as sRGB
// (we also avoid the unnecessary extra work of the else branch)
if (config != Config.ARGB_8888 || colorSpace == ColorSpace.get(ColorSpace.Named.SRGB)) {
bm = nativeCreate(null, 0, width, width, height, config.nativeInt, true, null, null);
} else {
if (!(colorSpace instanceof ColorSpace.Rgb)) {