summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/cache
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2013-03-15 15:33:38 -0700
committerRuben Brunk <rubenbrunk@google.com>2013-03-15 18:01:51 -0700
commitf88f1d99563ddcfe15fed8fe98a293c0a5de0d82 (patch)
treefe03efc0eb2ba7e9cbeb0a0cd35fe879c5e0c532 /src/com/android/gallery3d/filtershow/cache
parent0fe391a43d0c549fa0effddd21ece4eb4ba86194 (diff)
downloadandroid_packages_apps_Snap-f88f1d99563ddcfe15fed8fe98a293c0a5de0d82.tar.gz
android_packages_apps_Snap-f88f1d99563ddcfe15fed8fe98a293c0a5de0d82.tar.bz2
android_packages_apps_Snap-f88f1d99563ddcfe15fed8fe98a293c0a5de0d82.zip
Refactoring iconbutton.
Change-Id: Ie1538d978605ae28bb4fa6779eb2802794a35312
Diffstat (limited to 'src/com/android/gallery3d/filtershow/cache')
-rw-r--r--src/com/android/gallery3d/filtershow/cache/ImageLoader.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
index 2c1a847f8..ef3e3d5ce 100644
--- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
+++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
@@ -255,6 +255,11 @@ public class ImageLoader {
try {
is = mContext.getContentResolver().openInputStream(uri);
BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is, false);
+ Rect r = new Rect(0, 0, decoder.getWidth(), decoder.getHeight());
+ // return null if bounds are not entirely within the bitmap
+ if (!r.contains(bounds)) {
+ return null;
+ }
return decoder.decodeRegion(bounds, options);
} catch (FileNotFoundException e) {
Log.e(LOGTAG, "FileNotFoundException: " + uri);