summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d
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
commit6c8ccb0f98a4cd10c5987f492f9a94f650c89b1b (patch)
treea7de3d4710bd72b4ad692c8792df47fa6e27173b /src/com/android/gallery3d
parent42efcaee079e35e6764886aa2dfb142b137b751b (diff)
downloadandroid_packages_apps_Snap-6c8ccb0f98a4cd10c5987f492f9a94f650c89b1b.tar.gz
android_packages_apps_Snap-6c8ccb0f98a4cd10c5987f492f9a94f650c89b1b.tar.bz2
android_packages_apps_Snap-6c8ccb0f98a4cd10c5987f492f9a94f650c89b1b.zip
Do not copy XMP data if it has TinyPlanet filter
bug:7429072 Change-Id: I791db8ae8157741eb4cd74e9b6f749275b6b6cc3
Diffstat (limited to 'src/com/android/gallery3d')
-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;
}