X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FPicture.java;h=a4cc602a6b4e4e017ccb6d7b66e08a6f9fea4b0e;hb=bb38b8569de61718a7be9f728eabdf2c7c240c42;hp=3f60854366735d7f3d3e5b8574bcbe3c505b44d4;hpb=6242c991f365dbd67eba62ecfa5df769a83fcbc6;p=org.ibex.core.git

diff --git a/src/org/xwt/Picture.java b/src/org/xwt/Picture.java
index 3f60854..a4cc602 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>
@@ -14,7 +18,43 @@ package org.xwt;
  *    example, using a Pixmap on X11).
  *    </p>
  */
-public interface Picture {
-    public int getHeight();
-    public int getWidth();
+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();
+    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) {
+        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);
+        }
+    }
 }