2004/01/13 03:59:35

[org.ibex.core.git] / src / org / xwt / Picture.java

diff --git a/src/org/xwt/Picture.java b/src/org/xwt/Picture.java
index eb32928..4cbd299 100644 (file)
--- a/src/org/xwt/Picture.java
+++ b/src/org/xwt/Picture.java
@@ -1,4 +1,4 @@
-// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
 import java.io.*;
 import org.xwt.js.*;
@@ -17,24 +17,47 @@ import org.xwt.translators.*;
 public class Picture {
 
     public Picture() { this.res = null; }
-    public Picture(Res r) { this.res = r; }
-    private static Cache cache = new Cache(100);   ///< Picture, keyed by the Res that loaded them
+    public Picture(Stream r) { this.res = r; }
+    private static Cache cache = new Cache(100);   ///< Picture, keyed by the Stream that loaded them
 
-    public Res res = null;                         ///< the resource we were loaded from
+    public Stream res = null;                         ///< the resource we were loaded from
     public int width = -1;                         ///< the width of the image
     public int height = -1;                        ///< the height of the image
     public int[] data = null;                      ///< argb samples
     public boolean isLoaded = false;               ///< true iff the image is fully loaded
     
     /** turns a resource into a Picture.Source and passes it to the callback */
-    public static Picture load(final Res r, final Scheduler.Task callback) {
+    public static Picture load(final Stream r, final Scheduler.Task callback) {
         Picture ret = (Picture)cache.get(r);
         if (ret == null) cache.put(r, ret = Platform.createPicture(r));
+        final Picture p = ret;
         if (!ret.isLoaded && callback != null)
             new java.lang.Thread() { public void run() {
+                // get the InputStream for the image
+                InputStream in = null;
                 try {
-                    PushbackInputStream pbis = new PushbackInputStream(r.getInputStream());
-                    Picture p = null;
+                    in = r.getInputStream();
+                } catch (IOException e) {
+                    in = null;
+                    if (r instanceof Stream.Ref) {
+                        // add extensions to the resource, looking for the image
+                        Stream.Ref ref = (Stream.Ref)r;
+                        Stream newr;
+
+                        String[] exts = new String[] { ".png", ".jpeg", ".gif" };
+                        for (int i=0; i < exts.length && in == null; i++) {
+                            newr = ref.addExtension(exts[i]);
+                            try { in = newr.getInputStream(); }
+                            catch (IOException f) { in = null; }
+                        }
+                    }
+                }
+        
+                // could not find image
+                if (in == null) { Log.info(Picture.class, "couldn't load image for resource " + r); return; }
+
+                try {
+                    PushbackInputStream pbis = new PushbackInputStream(in);
                     int firstByte = pbis.read();
                     if (firstByte == -1) throw new JSExn("empty stream reading image");
                     pbis.unread(firstByte);
@@ -42,12 +65,14 @@ public class Picture {
                     else if ((firstByte & 0xff) == 137)  PNG.load(pbis, p);
                     else if ((firstByte & 0xff) == 0xff) Platform.decodeJPEG(pbis, p);
                     else throw new JSExn("couldn't figure out image type from first byte");
+                    p.isLoaded = true;
                     Scheduler.add(callback);
                 } catch (Exception e) {
-                    Log.log(this, "exception while loading image");
-                    Log.log(this, e);
+                    Log.info(this, "exception while loading image");
+                    Log.info(this, e);
                 }
             } }.start();
+
         return ret;
     }
 }