diff options
| author | Mike Reed <reed@google.com> | 2014-07-08 19:16:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-07 19:25:01 +0000 |
| commit | 24b45fee5d59bed2d005fb07d129f67bfb16b97a (patch) | |
| tree | 30beac0ddda9964b8a4a04cf2b02a5e5dd21761a /native/graphics/jni/bitmap.cpp | |
| parent | 684b8ce8de45ccec5034bef14a4cb353fc63c31c (diff) | |
| parent | 1103b3255945d2eb2fa9c191e84e2270b343cca9 (diff) | |
| download | frameworks_base-24b45fee5d59bed2d005fb07d129f67bfb16b97a.zip frameworks_base-24b45fee5d59bed2d005fb07d129f67bfb16b97a.tar.gz frameworks_base-24b45fee5d59bed2d005fb07d129f67bfb16b97a.tar.bz2 | |
Merge "SkBitmap::Config is deprecated, use SkColorType"
Diffstat (limited to 'native/graphics/jni/bitmap.cpp')
| -rw-r--r-- | native/graphics/jni/bitmap.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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: |