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

Merge "NDK: Report RGBA_F16 as appropriate"

Browse Source
This commit is contained in:
Leon Scroggins
2019-08-14 13:38:23 +00:00
committed by Android (Google) Code Review
parent 5be260e609 eefe3fb065
commit d6d443229f
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

@@ -237,10 +237,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);
@@ -262,6 +258,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;