2003/11/13 05:04:22

[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..942bf03 100644 (file)
--- a/src/org/xwt/Picture.java
+++ b/src/org/xwt/Picture.java
@@ -34,27 +34,32 @@ public abstract class Picture {
     private static GIF gif = new GIF();
     
     /** 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;
-        }
-
-        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);
-        } catch (Exception e) {
-            Log.log(Picture.class, e);
-        }
+        if (ret != null) return ret;
+        if (callback != null)
+            new java.lang.Thread() { public void run() {
+                try {
+                    final byte[] b = InputStreamToByteArray.convert(r.getInputStream());
+                    Scheduler.add(new Scheduler.Task() { public void perform() {
+                        try {
+                            Picture ret = null;
+                            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);
+                        } } });
+                } catch (IOException e) {
+                    Log.log(Picture.class, e);
+                    return;
+                }
+            } }.start();
+        return null;
     }
 }