summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2012-11-28 17:46:32 -0800
committernicolasroard <nicolasroard@google.com>2012-11-28 17:46:32 -0800
commite7e5139881dd46de4a80a4191658e6269a155467 (patch)
tree2c9bb5dddb5926be65405fe1710b7edfe9681c69 /src
parent316f5ae840f88690c59df8f9d0d5c797adc6ee68 (diff)
downloadandroid_packages_apps_Snap-e7e5139881dd46de4a80a4191658e6269a155467.tar.gz
android_packages_apps_Snap-e7e5139881dd46de4a80a4191658e6269a155467.tar.bz2
android_packages_apps_Snap-e7e5139881dd46de4a80a4191658e6269a155467.zip
Fix flashing in geometry panel
bug:7406402 Change-Id: If2c6156349b90dfc57c56284ad6d821731e48e1a
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/filtershow/presets/ImagePreset.java4
1 files changed, 2 insertions, 2 deletions
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);
}