X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fibex%2Fgraphics%2FPicture.java;h=c8b58955f34ba009903c3599c9382ab3048ac6e3;hb=1de73c721bbd73f275ba85de292463cdd8a0fbc0;hp=572823c47e9ed70b3a91be813f3dce17135e0394;hpb=b0ec2e1d6c3bd35205dfffc6893f01157aef2ced;p=org.ibex.core.git

diff --git a/src/org/ibex/graphics/Picture.java b/src/org/ibex/graphics/Picture.java
index 572823c..c8b5895 100644
--- a/src/org/ibex/graphics/Picture.java
+++ b/src/org/ibex/graphics/Picture.java
@@ -1,4 +1,7 @@
-// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the GNU General Public License version 2 ("the License").
+// You may not use this file except in compliance with the License.
+
 package org.ibex.graphics;
 import java.io.*;
 import org.ibex.js.*;
@@ -19,7 +22,7 @@ public class Picture {
 
     public Picture() { this.stream = null; }
     public Picture(JS r) { this.stream = r; }
-    private static Cache cache = new Cache(100);   ///< Picture, keyed by the Stream that loaded them
+    private static Cache cache = new Cache(100, true); ///< Picture, keyed by the Stream that loaded them
 
     public JS stream = null;                       ///< the stream we were loaded from
     public int width = -1;                         ///< the width of the image
@@ -31,7 +34,7 @@ public class Picture {
     protected void loaded() { isLoaded = true; }
 
     /** turns a stream into a Picture.Source and passes it to the callback */
-    public static Picture load(final JS stream, final Task callback) {
+    public static Picture load(final JS stream, final Callable callback) {
         if(stream == null) throw new NullPointerException();
         Picture ret = (Picture)cache.get(stream);
         if (ret == null) {
@@ -46,8 +49,8 @@ public class Picture {
             new java.lang.Thread() { public void run() {
                 InputStream in = null;
                 try {
-                    in = b == null ? Stream.getInputStream(stream) : b.getImage();
-                } catch (IOException e) { Log.error(Picture.class, e);
+                    in = b == null ? JSU.getInputStream(stream) : b.getImage();
+                //} catch (IOException e) { Log.error(Picture.class, e);
                 } catch (JSExn e) { Log.error(Picture.class, e);
                 }
                 if (in == null) { Log.warn(Picture.class, "couldn't load image for stream " + stream.unclone()); return; }