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 | 98f62053abe7cd461408ff7c0b48e3cf14d07068 (patch) | |
| tree | 57113acc61cf6b3b6c896af496aeffeee2a8a79a | |
| parent | f8146ef8913e28cd895b6aa528f91615ed0d4c6c (diff) | |
| parent | 7fcf15ec7f1dc20d211c6211bb3a464d12449ffa (diff) | |
| download | android_packages_apps_Snap-98f62053abe7cd461408ff7c0b48e3cf14d07068.tar.gz android_packages_apps_Snap-98f62053abe7cd461408ff7c0b48e3cf14d07068.tar.bz2 android_packages_apps_Snap-98f62053abe7cd461408ff7c0b48e3cf14d07068.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; } |