summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2012-10-28 18:35:11 -0700
committerJohn Hoford <hoford@google.com>2012-10-28 18:35:11 -0700
commit7fcf15ec7f1dc20d211c6211bb3a464d12449ffa (patch)
tree431400c0e55891dea3940f82d57a617221a69538
parent6a96acff4169070a82be05d0eed3ec27bc02420d (diff)
downloadandroid_packages_apps_Snap-7fcf15ec7f1dc20d211c6211bb3a464d12449ffa.tar.gz
android_packages_apps_Snap-7fcf15ec7f1dc20d211c6211bb3a464d12449ffa.tar.bz2
android_packages_apps_Snap-7fcf15ec7f1dc20d211c6211bb3a464d12449ffa.zip
Do not copy XMP data if it has TinyPlanet filter
bug:7429072 Change-Id: I791db8ae8157741eb4cd74e9b6f749275b6b6cc3
-rw-r--r--src/com/android/gallery3d/filtershow/presets/ImagePreset.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index 87e1934fd..8943f30de 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -124,6 +124,10 @@ public class ImagePreset {
&& !filter.isNil()) {
return false;
}
+ if (filter.getFilterType() == ImageFilter.TYPE_TINYPLANET
+ && !filter.isNil()) {
+ return false;
+ }
}
return true;
}