am 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryce

[android-x86/packages-apps-Gallery2.git] / src / com / android / gallery3d / filtershow / cache / CachingPipeline.java

diff --git a/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java b/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java
index 687376f..de3ff3d 100644 (file)
--- a/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java
+++ b/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java
@@ -96,6 +96,10 @@ public class CachingPipeline {
         sResources = null;
     }
 
+    public void stop() {
+        mEnvironment.setStop(true);
+    }
+
     public synchronized void reset() {
         synchronized (CachingPipeline.class) {
             if (getRenderScriptContext() == null) {
@@ -170,6 +174,7 @@ public class CachingPipeline {
         }
         mEnvironment.setQuality(ImagePreset.QUALITY_PREVIEW);
         mEnvironment.setImagePreset(preset);
+        mEnvironment.setStop(false);
     }
 
     public void setOriginal(Bitmap bitmap) {
@@ -294,7 +299,9 @@ public class CachingPipeline {
                 }
 
                 Bitmap bmp = preset.apply(bitmap, mEnvironment);
-                request.setBitmap(bmp);
+                if (!mEnvironment.needsStop()) {
+                    request.setBitmap(bmp);
+                }
                 mFiltersManager.freeFilterResources(preset);
             }
         }