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

NDK: Report RGBA_F16 as appropriate

Browse Source 
Bug: 135133301
Test: Id904c8cb4b22505635744ab271a639ace24ddbab

I3c17faf174b109b7c31c2eb5d1249bc881923b10 adds a new AndroidBitmapFormat
which corresponds to Bitmap.Config.RGBA_F16. Report it if that is the
format of the Bitmap.

Remove unnecessary SkASSERTs, which are turned off for Android builds.

Change-Id: Id05497d0bcbfa5ccb3109e2819eecbbf84d35149
This commit is contained in:
Leon Scroggins III
2019-08-12 14:36:28 -04:00
parent ced64357f8
commit eefe3fb065
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -238,10 +238,6 @@ Bitmap& toBitmap(jlong bitmapHandle) {
}
void imageInfo(JNIEnv* env, jobject bitmap, AndroidBitmapInfo* info) {
SkASSERT(info);
SkASSERT(env);
SkASSERT(bitmap);
SkASSERT(env->IsInstanceOf(bitmap, gBitmap_class));
jlong bitmapHandle = env->GetLongField(bitmap, gBitmap_nativePtr);
LocalScopedBitmap localBitmap(bitmapHandle);
@@ -263,6 +259,9 @@ void imageInfo(JNIEnv* env, jobject bitmap, AndroidBitmapInfo* info) {
case kAlpha_8_SkColorType:
info->format = ANDROID_BITMAP_FORMAT_A_8;
break;
case kRGBA_F16_SkColorType:
info->format = ANDROID_BITMAP_FORMAT_RGBA_F16;
break;
default:
info->format = ANDROID_BITMAP_FORMAT_NONE;
break;