X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fgraphics%2FPicture.java;h=ce7b20b2d3b802daa00530c9f1ff4ea709649dbf;hp=c8b58955f34ba009903c3599c9382ab3048ac6e3;hb=890000a10a0ccdc49f62946bddf1c0b840495a94;hpb=1de73c721bbd73f275ba85de292463cdd8a0fbc0 diff --git a/src/org/ibex/graphics/Picture.java b/src/org/ibex/graphics/Picture.java index c8b5895..ce7b20b 100644 --- a/src/org/ibex/graphics/Picture.java +++ b/src/org/ibex/graphics/Picture.java @@ -7,7 +7,6 @@ import java.io.*; import org.ibex.js.*; import org.ibex.plat.*; import org.ibex.util.*; -import org.ibex.core.*; /** * The in-memory representation of a PNG or GIF image. It is @@ -44,14 +43,12 @@ public class Picture { } final Picture p = ret; if (!ret.isLoaded && callback != null) { - // FEATURE: This is kind of ugly - shouldn't need a blessing - final Ibex.Blessing b = Ibex.Blessing.getBlessing(stream); new java.lang.Thread() { public void run() { InputStream in = null; try { - in = b == null ? JSU.getInputStream(stream) : b.getImage(); - //} catch (IOException e) { Log.error(Picture.class, e); - } catch (JSExn e) { Log.error(Picture.class, e); + in = JSU.getInputStream(stream); + } 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; } try { @@ -64,7 +61,7 @@ public class Picture { else if ((firstByte & 0xff) == 0xff) Platform.decodeJPEG(pbis, p); else throw new JSExn("couldn't figure out image type from first byte"); p.loaded(); - Scheduler.add(callback); + Platform.Scheduler.add(callback); } catch (Exception e) { Log.info(this, "exception while loading image"); Log.info(this, e);