public abstract int getWidth();
/** Pictures, cache keyed by Res instance */
- private static Cache cache = new Cache();
+ private static Cache cache = new Cache(100);
private static GIF gif = new GIF();
- // FIXME: return a Picture that gets filled in later
+ public static class Holder {
+ public Picture picture = null;
+ }
+
/** turns a resource into a Picture.Source and passes it to the callback */
- public static Picture fromRes(final Res r, final Callback callback) {
- Picture ret = (Picture)cache.get(r);
- if (ret != null) return ret;
- try {
- Platform.inputStreamToByteArray(r.getInputStream(), new Callback() { public Object call(Object o) {
+ public static Holder fromRes(final Res r, final Scheduler.Task callback) {
+ Holder ret = (Holder)cache.get(r);
+ if (ret == null) {
+ ret = new Holder();
+ cache.put(r, ret);
+ if (callback == null) return null;
+ }
+ final Holder holder = ret;
+ if (callback != null)
+ new java.lang.Thread() { public void run() {
try {
- Picture ret = null;
- byte[] b = (byte[])o;
- InputStream pbis = new ByteArrayInputStream(b);
- if ((b[0] & 0xff) == 'G') ret = gif.fromInputStream(pbis, r.getDescriptiveName());
- else if ((b[0] & 0xff) == 137) ret = new PNG().fromInputStream(pbis, r.getDescriptiveName());
- else if ((b[0] & 0xff) == 0xff) ret = Platform.decodeJPEG(pbis, r.getDescriptiveName());
- else throw new JS.Exn("couldn't figure out image type from first byte");
- ret.res = r;
- cache.put(r, ret);
- callback.call(ret);
- } catch (Exception e) {
+ final byte[] b = InputStreamToByteArray.convert(r.getInputStream());
+ Scheduler.add(new Scheduler.Task() { public void perform() {
+ try {
+ Picture p = null;
+ InputStream pbis = new ByteArrayInputStream(b);
+ if ((b[0] & 0xff) == 'G') p = gif.fromInputStream(pbis, "some picture");
+ else if ((b[0] & 0xff) == 137) p = new PNG().fromInputStream(pbis, "some picture");
+ else if ((b[0] & 0xff) == 0xff) p = Platform.decodeJPEG(pbis, "some picture");
+ else throw new JSExn("couldn't figure out image type from first byte");
+ p.res = r;
+ holder.picture = p;
+ Scheduler.add(callback);
+ } catch (Exception e) {
+ Log.log(Picture.class, e);
+ } } });
+ } catch (IOException e) {
Log.log(Picture.class, e);
+ return;
}
- return null;
- }});
- } catch (Exception e) {
- Log.log(Picture.class, e);
- }
- return null;
+ } }.start();
+ return ret;
}
}