summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-09-17 16:48:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-17 16:48:41 -0700
commit89746d6be516b079a7f5ae5a20925275e746e2e2 (patch)
tree7452094f42f39041566e099eec186864d9ff657b
parentec740116bb75a841185290d3ea04e917529bf078 (diff)
parenta56c88cd1caa8c48a99f32b30bfac513425895d9 (diff)
downloadandroid_packages_apps_Gallery2-89746d6be516b079a7f5ae5a20925275e746e2e2.tar.gz
android_packages_apps_Gallery2-89746d6be516b079a7f5ae5a20925275e746e2e2.tar.bz2
android_packages_apps_Gallery2-89746d6be516b079a7f5ae5a20925275e746e2e2.zip
am a56c88cd: am a2ab33fb: am b17765a3: fix bug in saving preset
* commit 'a56c88cd1caa8c48a99f32b30bfac513425895d9': fix bug in saving preset
-rw-r--r--src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java1
-rw-r--r--src/com/android/gallery3d/filtershow/tools/XmpPresets.java2
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;