X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FPicture.java;h=29e3184402cbf80671eae164e36538223b067f2a;hb=6b010667b40641fdb82925e56466f847f721ef1f;hp=8cd3c972feaf442ea4c786fed2fe599cfe433e8d;hpb=c6069948906645d974f46bdb96617a9a6a504636;p=org.ibex.core.git

diff --git a/src/org/xwt/Picture.java b/src/org/xwt/Picture.java
index 8cd3c97..29e3184 100644
--- a/src/org/xwt/Picture.java
+++ b/src/org/xwt/Picture.java
@@ -1,5 +1,9 @@
 // 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>
@@ -15,6 +19,39 @@ package org.xwt;
  *    </p>
  */
 public abstract class Picture {
+
+    /** Pictures, cached by Res */
+    private static Cache cache = new Cache();
+
+    private static GIF gif = new GIF();
+    private static PNG png = new PNG();
+    
+    /** 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);
+                if (c == 'G') ret = gif.fromInputStream(pbis, r.getDescriptiveName());
+                else if (c == 137) ret = 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);
+            } catch (IOException e) {
+                Log.logJS(Picture.class, e);
+                return null;
+            }
+        }
+        return ret;
+    }
+
+    /** the height of the picture */
     public abstract int getHeight();
+    
+    /** the width of the picture */
     public abstract int getWidth();
+
 }