commit | 6e9123a658d4ed0dcb80dd376c676f043e2f4baa | [log] [tgz] |
---|---|---|
author | nicolasroard <nicolasroard@google.com> | Wed Nov 28 21:00:30 2012 -0800 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 28 21:00:30 2012 -0800 |
tree | 2e10c19b1150255463b94a35619fe0db59da6adc | |
parent | 68e4ae64380e2c9843faaec63b98ba51479c0f11 [diff] | |
parent | 78cabea71ab108b1de80a0e63cc16aec6bd64fb2 [diff] |
Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java index d00c7e3..7f4d5ed 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
@@ -130,6 +130,9 @@ } 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 8943f30..2522c89 100644 --- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java +++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -181,7 +181,7 @@ return false; } - if (mImageBorder != preset.mImageBorder) { + if (mDoApplyGeometry && mImageBorder != preset.mImageBorder) { return false; } @@ -292,7 +292,7 @@ } } - if (mImageBorder != null) { + if (mImageBorder != null && mDoApplyGeometry) { bitmap = mImageBorder.apply(bitmap, mScaleFactor, mIsHighQuality); }