OSDN Git Service

small bug in reading presets
authorJohn Hoford <hoford@google.com>
Fri, 28 Jun 2013 00:33:52 +0000 (17:33 -0700)
committerJohn Hoford <hoford@google.com>
Fri, 28 Jun 2013 00:33:52 +0000 (17:33 -0700)
Change-Id: I791a8407d72b92f5e46a33c254d44747308b2ba5

src/com/android/gallery3d/filtershow/presets/ImagePreset.java

index 2276ee7..6f752d9 100644 (file)
@@ -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()][]);
-    }
 }