summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Hoford <hoford@google.com>2013-09-17 16:31:27 -0700
committerJohn Hoford <hoford@google.com>2013-09-17 16:31:27 -0700
commitb17765a3e9ead269493d7a851a21af3622931c40 (patch)
treeac437977e7a4a0c20141863a49dcfc14981cb078 /src
parentb867739b4b748fd702b693843220e7691c2e5979 (diff)
downloadandroid_packages_apps_Gallery2-b17765a3e9ead269493d7a851a21af3622931c40.tar.gz
android_packages_apps_Gallery2-b17765a3e9ead269493d7a851a21af3622931c40.tar.bz2
android_packages_apps_Gallery2-b17765a3e9ead269493d7a851a21af3622931c40.zip
fix bug in saving preset
bug introduced in CL 361110 Change-Id: I8fd283859d0f0f6a4b9e06e95c533b68085c156a
Diffstat (limited to 'src')
-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;