public static Picture load(final Res 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 Res.Ref) {
+ // add extensions to the resource, looking for the image
+ Res.Ref ref = (Res.Ref)r;
+ Res 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);
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;
}
}