diff options
author | nicolasroard <nicolasroard@google.com> | 2012-11-28 17:46:32 -0800 |
---|---|---|
committer | nicolasroard <nicolasroard@google.com> | 2012-11-28 17:46:32 -0800 |
commit | 78cabea71ab108b1de80a0e63cc16aec6bd64fb2 (patch) | |
tree | 41961117429ed48491fd9015b5d00bafe298995e | |
parent | 987bc8aaafa55c45451937b27d94c1d602de4d68 (diff) | |
download | android_packages_apps_Gallery2-78cabea71ab108b1de80a0e63cc16aec6bd64fb2.tar.gz android_packages_apps_Gallery2-78cabea71ab108b1de80a0e63cc16aec6bd64fb2.tar.bz2 android_packages_apps_Gallery2-78cabea71ab108b1de80a0e63cc16aec6bd64fb2.zip |
Fix flashing in geometry panel
bug:7406402
Change-Id: If2c6156349b90dfc57c56284ad6d821731e48e1a
-rw-r--r-- | src/com/android/gallery3d/filtershow/filters/ImageFilter.java | 3 | ||||
-rw-r--r-- | src/com/android/gallery3d/filtershow/presets/ImagePreset.java | 4 |
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); } |