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

diff --git a/src/org/xwt/Picture.java b/src/org/xwt/Picture.java
index 89db921..13440f9 100644
--- a/src/org/xwt/Picture.java
+++ b/src/org/xwt/Picture.java
@@ -1,10 +1,14 @@
-// Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
+import java.io.*;
+import org.xwt.js.*;
+import org.xwt.util.*;
+import org.xwt.translators.*;
 
 /** 
  *    <p>
  *    The in-memory representation of a PNG or GIF image. It is
- *    read-only. It is usually passed to DoubleBuffer.drawPicture()
+ *    read-only. It is usually passed to PixelBuffer.drawPicture()
  *    </p>
  *
  *    <p>
@@ -15,6 +19,56 @@ package org.xwt;
  *    </p>
  */
 public abstract class Picture {
+
+    /** the resource that created this Picture */
+    public Res res = null;
+
+    /** the height of the picture */
     public abstract int getHeight();
+    
+    /** 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;
+    }
 }