- // FIXME: put self in background
- PushbackInputStream pbis = new PushbackInputStream(r.getInputStream());
- int c = pbis.read();
- pbis.unread(c);
- if (c == 'G') ret = gif.fromInputStream(pbis, r.getDescriptiveName());
- else if (c == 137) ret = new PNG().fromInputStream(pbis, r.getDescriptiveName());
- else if (c == 0xff) ret = Platform.decodeJPEG(pbis, r.getDescriptiveName());
- else throw new JS.Exn("couldn't figure out image type from first byte");
- cache.put(r, ret);
- ret.res = r;
- callback.call(ret);
+ Platform.inputStreamToByteArray(r.getInputStream(), new Callback() { public Object call(Object o) {
+ 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) {
+ Log.log(Picture.class, e);
+ }
+ return null;
+ }});