am 6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches

* commit '6e9123a658d4ed0dcb80dd376c676f043e2f4baa':
  Fix flashing in geometry panel

2 files changed, 5 insertions, 2 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
index d00c7e31b..7f4d5ed2a 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
@@ -130,6 +130,9 @@ public class ImageFilter implements Cloneable {
     }
 
     public boolean same(ImageFilter filter) {
+        if (filter == null) {
+            return false;
+        }
         if (!filter.getName().equalsIgnoreCase(getName())) {
             return false;
         }
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index 8943f30de..2522c8966 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -181,7 +181,7 @@ public class ImagePreset {
             return false;
         }
 
-        if (mImageBorder != preset.mImageBorder) {
+        if (mDoApplyGeometry && mImageBorder != preset.mImageBorder) {
             return false;
         }
 
@@ -292,7 +292,7 @@ public class ImagePreset {
             }
         }
 
-        if (mImageBorder != null) {
+        if (mImageBorder != null && mDoApplyGeometry) {
             bitmap = mImageBorder.apply(bitmap, mScaleFactor, mIsHighQuality);
         }