summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-02-22 11:35:41 -0800
committernicolasroard <nicolasroard@google.com>2013-02-22 11:35:56 -0800
commitea332c69f084322ebdd13419424ee5fab2351760 (patch)
tree73f475faf06f3b3427fa9b5ebc44dd7d140f6721 /src/com/android/gallery3d
parent2c87aafc0e4c5f67fe41c0cac301eabb6d5c716e (diff)
downloadandroid_packages_apps_Gallery2-ea332c69f084322ebdd13419424ee5fab2351760.tar.gz
android_packages_apps_Gallery2-ea332c69f084322ebdd13419424ee5fab2351760.tar.bz2
android_packages_apps_Gallery2-ea332c69f084322ebdd13419424ee5fab2351760.zip
Don't apply the filters twice in partial rendering...
Change-Id: I5ddcb74e2a6cf09852eec0049bee47581b402f28
Diffstat (limited to 'src/com/android/gallery3d')
-rw-r--r--src/com/android/gallery3d/filtershow/cache/ImageLoader.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
index 25bb6b60a..df4f3fd3a 100644
--- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
+++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
@@ -388,6 +388,10 @@ public class ImageLoader {
}
}
bmp = loadRegionBitmap(mUri, options, bounds);
+ if (destination != null) {
+ mLoadingLock.unlock();
+ return bmp;
+ }
if (bmp != null) {
// TODO: this workaround for RS might not be needed ultimately
Bitmap bmp2 = bmp.copy(Bitmap.Config.ARGB_8888, true);