diff options
| author | Romain Guy <romainguy@google.com> | 2013-03-04 17:55:55 -0800 |
|---|---|---|
| committer | Romain Guy <romainguy@google.com> | 2013-03-04 17:55:55 -0800 |
| commit | fe28ef84f253190faaecf6fa3848898e41212ddb (patch) | |
| tree | 0540a69429c7467faa0359db6de6659385a6f52b /graphics/java/android/graphics/BitmapFactory.java | |
| parent | 19d4dd8599cb870923ab349d2ab96cacffd9c6f5 (diff) | |
| download | frameworks_base-fe28ef84f253190faaecf6fa3848898e41212ddb.zip frameworks_base-fe28ef84f253190faaecf6fa3848898e41212ddb.tar.gz frameworks_base-fe28ef84f253190faaecf6fa3848898e41212ddb.tar.bz2 | |
Never resize a Bitmap down to 0 at load time
Bug #8313929
Change-Id: Ic9b691319f162228c72ad1afed4dfe0b4181c422
Diffstat (limited to 'graphics/java/android/graphics/BitmapFactory.java')
| -rw-r--r-- | graphics/java/android/graphics/BitmapFactory.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java index 905dc8e..ee768e6 100644 --- a/graphics/java/android/graphics/BitmapFactory.java +++ b/graphics/java/android/graphics/BitmapFactory.java @@ -566,8 +566,9 @@ public class BitmapFactory { float scale = targetDensity / (float) density; if (scale != 1.0f) { final Bitmap oldBitmap = bm; - bm = Bitmap.createScaledBitmap(oldBitmap, (int) (bm.getWidth() * scale + 0.5f), - (int) (bm.getHeight() * scale + 0.5f), true); + bm = Bitmap.createScaledBitmap(oldBitmap, + Math.max(1, (int) (bm.getWidth() * scale + 0.5f)), + Math.max(1, (int) (bm.getHeight() * scale + 0.5f)), true); if (bm != oldBitmap) oldBitmap.recycle(); if (isNinePatch) { |