diff options
| author | John Hoford <hoford@google.com> | 2013-06-27 17:33:52 -0700 |
|---|---|---|
| committer | John Hoford <hoford@google.com> | 2013-06-27 17:33:52 -0700 |
| commit | 312efd6469dd0a26e26d8838af4f5db6b40efe2f (patch) | |
| tree | 52052614e19d4316da85cac288089f6d69fe3664 | |
| parent | 6a50273a45cdda757daf9840e9e36a2b60eff1aa (diff) | |
| download | android_packages_apps_Gallery2-312efd6469dd0a26e26d8838af4f5db6b40efe2f.tar.gz android_packages_apps_Gallery2-312efd6469dd0a26e26d8838af4f5db6b40efe2f.tar.bz2 android_packages_apps_Gallery2-312efd6469dd0a26e26d8838af4f5db6b40efe2f.zip | |
small bug in reading presets
Change-Id: I791a8407d72b92f5e46a33c254d44747308b2ba5
| -rw-r--r-- | src/com/android/gallery3d/filtershow/presets/ImagePreset.java | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java index 2276ee71c..6f752d963 100644 --- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java +++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java @@ -59,7 +59,7 @@ public class ImagePreset { private boolean mPartialRendering = false; private Rect mPartialRenderingBounds; - private static final boolean DEBUG = false; + private static final boolean DEBUG = true; public ImagePreset() { } @@ -675,7 +675,7 @@ public class ImagePreset { Log.w(LOGTAG,"UNKNOWN FILTER! "+name); return false; } - filter.deSerializeRepresentation(read(sreader)); + filter.deSerializeRepresentation(sreader); addFilter(filter); } sreader.endObject(); @@ -689,18 +689,4 @@ public class ImagePreset { FiltersManager filtersManager = FiltersManager.getManager(); return filtersManager.createFilterFromName(name); } - - String[][] read(JsonReader reader) throws IOException { - ArrayList <String[]> al = new ArrayList<String[]>(); - - reader.beginObject(); - - while (reader.hasNext()) { - String[]kv = { reader.nextName(),reader.nextString()}; - al.add(kv); - - } - reader.endObject(); - return al.toArray(new String[al.size()][]); - } } |
