From 1103b3255945d2eb2fa9c191e84e2270b343cca9 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Tue, 8 Jul 2014 12:36:44 -0400 Subject: SkBitmap::Config is deprecated, use SkColorType Change-Id: Ic953741325607bf85598c097bb3ab648d4a08996 --- native/graphics/jni/bitmap.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'native') diff --git a/native/graphics/jni/bitmap.cpp b/native/graphics/jni/bitmap.cpp index eaa2cbe..df0751d 100644 --- a/native/graphics/jni/bitmap.cpp +++ b/native/graphics/jni/bitmap.cpp @@ -34,17 +34,17 @@ int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap, info->stride = bm->rowBytes(); info->flags = 0; - switch (bm->config()) { - case SkBitmap::kARGB_8888_Config: + switch (bm->colorType()) { + case kN32_SkColorType: info->format = ANDROID_BITMAP_FORMAT_RGBA_8888; break; - case SkBitmap::kRGB_565_Config: + case kRGB_565_SkColorType: info->format = ANDROID_BITMAP_FORMAT_RGB_565; break; - case SkBitmap::kARGB_4444_Config: + case kARGB_4444_SkColorType: info->format = ANDROID_BITMAP_FORMAT_RGBA_4444; break; - case SkBitmap::kA8_Config: + case kAlpha_8_SkColorType: info->format = ANDROID_BITMAP_FORMAT_A_8; break; default: -- cgit v1.1