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 /core/jni/android/graphics/NinePatchImpl.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 'core/jni/android/graphics/NinePatchImpl.cpp')
| -rw-r--r-- | core/jni/android/graphics/NinePatchImpl.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/jni/android/graphics/NinePatchImpl.cpp b/core/jni/android/graphics/NinePatchImpl.cpp index 1793208..c162c48 100644 --- a/core/jni/android/graphics/NinePatchImpl.cpp +++ b/core/jni/android/graphics/NinePatchImpl.cpp @@ -38,18 +38,18 @@ #include <utils/Log.h> static bool getColor(const SkBitmap& bitmap, int x, int y, SkColor* c) { - switch (bitmap.config()) { - case SkBitmap::kARGB_8888_Config: + switch (bitmap.colorType()) { + case kN32_SkColorType: *c = SkUnPreMultiply::PMColorToColor(*bitmap.getAddr32(x, y)); break; - case SkBitmap::kRGB_565_Config: + case kRGB_565_SkColorType: *c = SkPixel16ToPixel32(*bitmap.getAddr16(x, y)); break; - case SkBitmap::kARGB_4444_Config: + case kARGB_4444_SkColorType: *c = SkUnPreMultiply::PMColorToColor( SkPixel4444ToPixel32(*bitmap.getAddr16(x, y))); break; - case SkBitmap::kIndex8_Config: { + case kIndex_8_SkColorType: { SkColorTable* ctable = bitmap.getColorTable(); *c = SkUnPreMultiply::PMColorToColor( (*ctable)[*bitmap.getAddr8(x, y)]); |