From bfb76a89af606e65eb34099d08c27b471f8d1b29 Mon Sep 17 00:00:00 2001 From: John Hoford Date: Thu, 27 Jun 2013 17:33:52 -0700 Subject: small bug in reading presets Change-Id: I791a8407d72b92f5e46a33c254d44747308b2ba5 --- .../gallery3d/filtershow/presets/ImagePreset.java | 18 ++---------------- 1 file 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 al = new ArrayList(); - - reader.beginObject(); - - while (reader.hasNext()) { - String[]kv = { reader.nextName(),reader.nextString()}; - al.add(kv); - - } - reader.endObject(); - return al.toArray(new String[al.size()][]); - } } -- cgit v1.2.3