From 20ae55ef793f8a307fd0fc03a6010c36e7cbc56b Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Wed, 24 Oct 2012 11:08:01 -0700
Subject: limited the size of textures to 2048

bug:7404007
Change-Id: I77fac900e213ca16c2accfa8f59d0cd300559836
---
 src/com/android/gallery3d/filtershow/cache/ImageLoader.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
index ab1746d54..c25226548 100644
--- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
+++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
@@ -234,6 +234,7 @@ public class ImageLoader {
         return null;
     }
 
+    static final int MAX_BITMAP_DIM = 2048;
     private Bitmap loadScaledBitmap(Uri uri, int size) {
         InputStream is = null;
         try {
@@ -251,8 +252,11 @@ public class ImageLoader {
 
             int scale = 1;
             while (true) {
-                if (width_tmp / 2 < size || height_tmp / 2 < size)
-                    break;
+                if (width_tmp <= MAX_BITMAP_DIM && height_tmp <= MAX_BITMAP_DIM) {
+                    if (width_tmp / 2 < size || height_tmp / 2 < size) {
+                        break;
+                    }
+                }
                 width_tmp /= 2;
                 height_tmp /= 2;
                 scale *= 2;
-- 
cgit v1.2.3