From fe28ef84f253190faaecf6fa3848898e41212ddb Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Mon, 4 Mar 2013 17:55:55 -0800 Subject: [PATCH] Never resize a Bitmap down to 0 at load time Bug #8313929 Change-Id: Ic9b691319f162228c72ad1afed4dfe0b4181c422 --- graphics/java/android/graphics/BitmapFactory.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java index 905dc8ef1ac47..ee768e6d85362 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) {