diff options
| author | John Hoford <hoford@google.com> | 2012-10-29 03:32:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-29 03:32:32 -0700 |
| commit | 7cd69693797fc83ebd4f13607aac72c27bbe49ee (patch) | |
| tree | 0aef0f23a623e1220b13ff9a72672240fa3f4a82 | |
| parent | ae31775219bcfaf4e800cdd94525590a7cb64fc1 (diff) | |
| parent | 6c8ccb0f98a4cd10c5987f492f9a94f650c89b1b (diff) | |
| download | android_packages_apps_Snap-7cd69693797fc83ebd4f13607aac72c27bbe49ee.tar.gz android_packages_apps_Snap-7cd69693797fc83ebd4f13607aac72c27bbe49ee.tar.bz2 android_packages_apps_Snap-7cd69693797fc83ebd4f13607aac72c27bbe49ee.zip | |
am 17540e58: Do not copy XMP data if it has TinyPlanet filter
* commit '17540e58b8454e820a6273365cee94742d9b9900':
Do not copy XMP data if it has TinyPlanet filter
| -rw-r--r-- | src/com/android/gallery3d/filtershow/presets/ImagePreset.java | 4 |
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; } |