diff options
| author | John Hoford <hoford@google.com> | 2013-09-17 16:46:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-17 16:46:30 -0700 |
| commit | a56c88cd1caa8c48a99f32b30bfac513425895d9 (patch) | |
| tree | 010d2dc6c26fb1d679c3233949725d5c66243f6a | |
| parent | a29dfc6fdcbc19a6cccfe9cab39d5f2f5f304313 (diff) | |
| parent | a2ab33fb7d5f78e80c83013d8fd409a45a5d7093 (diff) | |
| download | android_packages_apps_Gallery2-a56c88cd1caa8c48a99f32b30bfac513425895d9.tar.gz android_packages_apps_Gallery2-a56c88cd1caa8c48a99f32b30bfac513425895d9.tar.bz2 android_packages_apps_Gallery2-a56c88cd1caa8c48a99f32b30bfac513425895d9.zip | |
am a2ab33fb: am b17765a3: fix bug in saving preset
* commit 'a2ab33fb7d5f78e80c83013d8fd409a45a5d7093':
fix bug in saving preset
| -rw-r--r-- | src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java | 1 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/tools/XmpPresets.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java index 736733451..393e19622 100644 --- a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java +++ b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java @@ -728,6 +728,7 @@ public class ImagePreset { } reader.close(); } catch (Exception e) { + Log.e(LOGTAG, "\""+filterString+"\""); Log.e(LOGTAG, "parsing the filter parameters:", e); return false; } diff --git a/src/com/android/gallery3d/filtershow/tools/XmpPresets.java b/src/com/android/gallery3d/filtershow/tools/XmpPresets.java index fdf476c15..7095e742d 100644 --- a/src/com/android/gallery3d/filtershow/tools/XmpPresets.java +++ b/src/com/android/gallery3d/filtershow/tools/XmpPresets.java @@ -77,7 +77,7 @@ public class XmpPresets { xmpMeta.setProperty(XMP_GOOGLE_FILTER_NAMESPACE, XMP_SRC_FILE_URI, srcUri.toString()); xmpMeta.setProperty(XMP_GOOGLE_FILTER_NAMESPACE, - XMP_FILTERSTACK, ImagePreset.JASON_SAVED); + XMP_FILTERSTACK, preset.getJsonString(ImagePreset.JASON_SAVED)); } catch (XMPException e) { Log.v(LOGTAG, "Write XMP meta to file failed:" + dstFile.getAbsolutePath()); return; |