Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6d44322 authored by Leon Scroggins's avatar Leon Scroggins Committed by Android (Google) Code Review
Browse files

Merge "NDK: Report RGBA_F16 as appropriate"

parents 5be260e6 eefe3fb0

core/jni/android/graphics/Bitmap.cpp

+3 −4
Original line number Diff line number Diff line
@@ -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;