X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FPicture.java;h=13440f95a02ff8a5b051f6000624badb38e80f1c;hb=0b0673bbc7f06c5d5418d5ab7ad5961a464e2de0;hp=88cf65b291f6c25f1511c6dedde1d2f79ff0a79e;hpb=a81a151e639664cb340cf3726f9e8b9c77d125fb;p=org.ibex.core.git

diff --git a/src/org/xwt/Picture.java b/src/org/xwt/Picture.java
index 88cf65b..13440f9 100644
--- a/src/org/xwt/Picture.java
+++ b/src/org/xwt/Picture.java
@@ -20,31 +20,8 @@ import org.xwt.translators.*;
  */
 public abstract class Picture {
 
-    /** Pictures, cached by Res */
-    private static Cache cache = new Cache();
-    
-    /** turns a resource into a Picture.Source */
-    public static Picture fromRes(Res r) {
-        // FIXME: put self in background thread if needed
-        Picture ret = (Picture)cache.get(r);
-        if (ret == null) {
-            try {
-                PushbackInputStream pbis = new PushbackInputStream(r.getInputStream());
-                int c = pbis.read();
-                pbis.unread(c);
-                // FEATURE: cache GIF/PNG objects, reuse int[]'s?
-                if (c == 'G') ret = new GIF().fromInputStream(pbis, "FIXME");
-                else if (c == 137) ret = new PNG().fromInputStream(pbis, "FIXME");
-                else if (c == 0xff) ret = Platform.decodeJPEG(pbis, "FIXME");
-                else throw new JS.Exn("couldn't figure out image type from first byte");
-                cache.put(r, ret);
-            } catch (IOException e) {
-                Log.logJS(Picture.class, e);
-                return null;
-            }
-        }
-        return ret;
-    }
+    /** the resource that created this Picture */
+    public Res res = null;
 
     /** the height of the picture */
     public abstract int getHeight();
@@ -52,4 +29,46 @@ public abstract class Picture {
     /** the width of the picture */
     public abstract int getWidth();
 
+    /** Pictures, cache keyed by Res instance */
+    private static Cache cache = new Cache(100);
+    private static GIF gif = new GIF();
+    
+    public static class Holder {
+        public Picture picture = null;
+    }
+
+    /** turns a resource into a Picture.Source and passes it to the callback */
+    public static Holder fromRes(final Res r, final Scheduler.Task callback) {
+        Holder ret = (Holder)cache.get(r);
+        if (ret == null) {
+            ret = new Holder();
+            cache.put(r, ret);
+            if (callback == null) return null;
+        }
+        final Holder holder = 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 p = null;
+                            InputStream pbis = new ByteArrayInputStream(b);
+                            if ((b[0] & 0xff) == 'G') p = gif.fromInputStream(pbis, "some picture");
+                            else if ((b[0] & 0xff) == 137) p = new PNG().fromInputStream(pbis, "some picture");
+                            else if ((b[0] & 0xff) == 0xff) p = Platform.decodeJPEG(pbis, "some picture");
+                            else throw new JS.Exn("couldn't figure out image type from first byte");
+                            p.res = r;
+                            holder.picture = p;
+                            Scheduler.add(callback);
+                        } catch (Exception e) {
+                            Log.log(Picture.class, e);
+                        } } });
+                } catch (IOException e) {
+                    Log.log(Picture.class, e);
+                    return;
+                }
+            } }.start();
+        return ret;
+    }
 }