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

Merge "Work around incorrect Skia gamma" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-19 22:10:31 +00:00
committed by Android (Google) Code Review
parent 83c4690f55 ce89a6e656
commit c45c2d65a5
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1669,6 +1669,8 @@ public final class Bitmap implements Parcelable {
if (mColorSpace == null) {
if (nativeIsSRGB(mNativePtr)) {
mColorSpace = ColorSpace.get(ColorSpace.Named.SRGB);
} else if (getConfig() == Config.HARDWARE && nativeIsSRGBLinear(mNativePtr)) {
mColorSpace = ColorSpace.get(ColorSpace.Named.LINEAR_EXTENDED_SRGB);
} else {
float[] xyz = new float[9];
float[] params = new float[7];
@@ -2092,5 +2094,6 @@ public final class Bitmap implements Parcelable {
private static native GraphicBuffer nativeCreateGraphicBufferHandle(long nativeBitmap);
private static native boolean nativeGetColorSpace(long nativePtr, float[] xyz, float[] params);
private static native boolean nativeIsSRGB(long nativePtr);
private static native boolean nativeIsSRGBLinear(long nativePtr);
private static native void nativeCopyColorSpace(long srcBitmap, long dstBitmap);
}