From 76344241719384f160ee623554f66987d0fcae41 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Mon, 30 Apr 2012 14:05:09 -0700
Subject: Fix scaling of layout bounds.

Change-Id: I9d8c8924900fed69030ee3e8d6decee89ca67820
---
 graphics/java/android/graphics/BitmapFactory.java | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'graphics/java/android')

diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java
index 1599e40a8d41..5094df188050 100644
--- a/graphics/java/android/graphics/BitmapFactory.java
+++ b/graphics/java/android/graphics/BitmapFactory.java
@@ -556,6 +556,7 @@ public class BitmapFactory {
             return bm;
         }
         byte[] np = bm.getNinePatchChunk();
+        int[] lb = bm.getLayoutBounds();
         final boolean isNinePatch = np != null && NinePatch.isNinePatchChunk(np);
         if (opts.inScaled || isNinePatch) {
             float scale = targetDensity / (float) density;
@@ -569,6 +570,13 @@ public class BitmapFactory {
                     np = nativeScaleNinePatch(np, scale, outPadding);
                     bm.setNinePatchChunk(np);
                 }
+                if (lb != null) {
+                    int[] newLb = new int[lb.length];
+                    for (int i=0; i<lb.length; i++) {
+                        newLb[i] = (int)((lb[i]*scale)+.5f);
+                    }
+                    bm.setLayoutBounds(newLb);
+                }
             }
 
             bm.setDensity(targetDensity);
-- 
cgit v1.2.3-59-g8ed1b