diff options
| author | Leon Scroggins III <scroggo@google.com> | 2014-05-27 20:42:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-27 20:42:44 +0000 |
| commit | 8f8c08516456944ae7ab15fea641ffb316268381 (patch) | |
| tree | 0199e4480b02ead85615b2c4b71584ecfaa4b816 /core/jni/android | |
| parent | 233a0ae88dc9fa36af20f5be4035cf5aeee5153b (diff) | |
| parent | 28408c23958bb14d296574853d8a576177a36a5b (diff) | |
| download | frameworks_base-8f8c08516456944ae7ab15fea641ffb316268381.zip frameworks_base-8f8c08516456944ae7ab15fea641ffb316268381.tar.gz frameworks_base-8f8c08516456944ae7ab15fea641ffb316268381.tar.bz2 | |
Merge "Remove call to deprecated SkBitmap::asImageInfo."
Diffstat (limited to 'core/jni/android')
| -rw-r--r-- | core/jni/android/graphics/BitmapFactory.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp index 7aa241a..928a7f8 100644 --- a/core/jni/android/graphics/BitmapFactory.cpp +++ b/core/jni/android/graphics/BitmapFactory.cpp @@ -128,8 +128,7 @@ static void scaleNinePatchChunk(android::Res_png_9patch* chunk, float scale) { static SkPixelRef* installPixelRef(SkBitmap* bitmap, SkStreamRewindable* stream, int sampleSize, bool ditherImage) { - SkImageInfo bitmapInfo; - if (!bitmap->asImageInfo(&bitmapInfo)) { + if (kUnknown_SkColorType == bitmap->colorType()) { ALOGW("bitmap has unknown configuration so no memory has been allocated"); return NULL; } @@ -137,9 +136,9 @@ static SkPixelRef* installPixelRef(SkBitmap* bitmap, SkStreamRewindable* stream, SkImageRef* pr; // only use ashmem for large images, since mmaps come at a price if (bitmap->getSize() >= 32 * 1024) { - pr = new SkImageRef_ashmem(bitmapInfo, stream, sampleSize); + pr = new SkImageRef_ashmem(bitmap->info(), stream, sampleSize); } else { - pr = new SkImageRef_GlobalPool(bitmapInfo, stream, sampleSize); + pr = new SkImageRef_GlobalPool(bitmap->info(), stream, sampleSize); } pr->setDitherImage(ditherImage); bitmap->setPixelRef(pr)->unref(); |