Shows filtered images in geometry modules and comparison.

bug:7279469
bug:7379286
bug:7344214
bug:7379140

Also:
- cache multiple version (with/without geometry or filters applied)
- doesn't show the original image anymore when waiting for a filtered version (shows nothing instead for now)
- fix potential crash in Curves

Change-Id: I4eabd42c30f6d370571f177d5efe92550798aed8

1 files changed, 7 insertions, 3 deletions

diff --git a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
index 81da9f80e..8f7560e10 100644
--- a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
+++ b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
@@ -89,8 +89,8 @@ public class ImageCurves extends ImageSlave {
 
         gPaint.setAntiAlias(true);
 
-        if (getImagePreset() != mLastPreset) {
-            new ComputeHistogramTask().execute(mFilteredImage);
+        if (getImagePreset() != mLastPreset && getFilteredImage() != null) {
+            new ComputeHistogramTask().execute(getFilteredImage());
             mLastPreset = getImagePreset();
         }
 
@@ -185,6 +185,10 @@ public class ImageCurves extends ImageSlave {
             return true;
         }
 
+        if (curves() == null) {
+            return true;
+        }
+
         Spline spline = getSpline(mCurrentCurveIndex);
         int pick = pickControlPoint(posX, posY);
         if (mCurrentControlPoint == null) {
@@ -212,7 +216,7 @@ public class ImageCurves extends ImageSlave {
     public synchronized void updateCachedImage() {
         // update image
         if (getImagePreset() != null) {
-            mImageLoader.resetImageForPreset(getImagePreset(), this);
+            resetImageCaches(this);
             invalidate();
         }
     }