2003/11/03 00:08:26

[org.ibex.core.git] / src / org / xwt / Picture.java

diff --git a/src/org/xwt/Picture.java b/src/org/xwt/Picture.java
index a4cc602..38f9c0a 100644 (file)
--- a/src/org/xwt/Picture.java
+++ b/src/org/xwt/Picture.java
@@ -33,28 +33,32 @@ public abstract class Picture {
     private static Cache cache = new Cache();
     private static GIF gif = new GIF();
     
+    // FIXME: return a Picture that gets filled in later
     /** turns a resource into a Picture.Source and passes it to the callback */
-    public static void fromRes(final Res r, final Callback callback) {
+    public static Picture fromRes(final Res r, final Callback callback) {
         Picture ret = (Picture)cache.get(r);
-        if (ret != null) {
-            callback.call(ret);
-            return;
-        }
-
+        if (ret != null) return ret;
         try {
-            // FIXME: put self in background
-            PushbackInputStream pbis = new PushbackInputStream(r.getInputStream());
-            int c = pbis.read();
-            pbis.unread(c);
-            if (c == 'G') ret = gif.fromInputStream(pbis, r.getDescriptiveName());
-            else if (c == 137) ret = new PNG().fromInputStream(pbis, r.getDescriptiveName());
-            else if (c == 0xff) ret = Platform.decodeJPEG(pbis, r.getDescriptiveName());
-            else throw new JS.Exn("couldn't figure out image type from first byte");
-            cache.put(r, ret);
-            ret.res = r;
-            callback.call(ret);
+            Platform.inputStreamToByteArray(r.getInputStream(), new Callback() { public Object call(Object o) {
+                try {
+                    Picture ret = null;
+                    byte[] b = (byte[])o;
+                    InputStream pbis = new ByteArrayInputStream(b);
+                    if ((b[0] & 0xff) == 'G') ret = gif.fromInputStream(pbis, r.getDescriptiveName());
+                    else if ((b[0] & 0xff) == 137) ret = new PNG().fromInputStream(pbis, r.getDescriptiveName());
+                    else if ((b[0] & 0xff) == 0xff) ret = Platform.decodeJPEG(pbis, r.getDescriptiveName());
+                    else throw new JS.Exn("couldn't figure out image type from first byte");
+                    ret.res = r;
+                    cache.put(r, ret);
+                    callback.call(ret);
+                } catch (Exception e) {
+                    Log.log(Picture.class, e);
+                }
+                return null;
+            }});
         } catch (Exception e) {
             Log.log(Picture.class, e);
         }
+        return null;
     }
 }