2003/04/10 01:41:43

[org.ibex.core.git] / src / org / xwt / plat / AWT.java

diff --git a/src/org/xwt/plat/AWT.java b/src/org/xwt/plat/AWT.java
index 7005f1e..81edee0 100644 (file)
--- a/src/org/xwt/plat/AWT.java
+++ b/src/org/xwt/plat/AWT.java
@@ -127,12 +127,12 @@ public class AWT extends Platform {
 
         int[] data = null;
         public Image i = null;
-        private static MediaTracker mediatracker = new MediaTracker(new Canvas());
         private static ColorModel cmodel = new DirectColorModel(32, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000);
         
         public AWTPicture(int[] b, int w, int h) {
             data = b;
             Image img = Toolkit.getDefaultToolkit().createImage(new MemoryImageSource(w, h, cmodel, b, 0, w));
+           MediaTracker mediatracker = new MediaTracker(new Canvas());
             mediatracker.addImage(img, 1);
             try { mediatracker.waitForAll(); } catch (InterruptedException e) { }
             mediatracker.removeImage(img);
@@ -411,6 +411,34 @@ public class AWT extends Platform {
         }
     }
 
+    protected ImageDecoder _decodeJPEG(InputStream is, String name) {
+       try {
+           Image i = Toolkit.getDefaultToolkit().createImage(org.xwt.Resources.isToByteArray(is));
+           MediaTracker mediatracker = new MediaTracker(new Canvas());
+            mediatracker.addImage(i, 1);
+           try { mediatracker.waitForAll(); } catch (InterruptedException e) { }
+           mediatracker.removeImage(i);
+           final int width = i.getWidth(null);
+           final int height = i.getHeight(null);
+           final int[] data = new int[width * height];
+           PixelGrabber pg = new PixelGrabber(i, 0, 0, width, height, data, 0, width);
+           pg.grabPixels();
+           if ((pg.getStatus() & ImageObserver.ABORT) != 0) {
+               Log.log(this, "PixelGrabber reported an error while decoding JPEG image " + name);
+               return null;
+           }
+           return new ImageDecoder() {
+                   public int getWidth() { return width; }
+                   public int getHeight() { return height; }
+                   public int[] getData() { return data; }
+               };
+       } catch (Exception e) {
+           Log.log(this, "Exception caught while decoding JPEG image " + name);
+           Log.log(this, e);
+           return null;
+       }
+    }
+
     // Font Handling Stuff //////////////////////////////////////////////////////////
 
     protected String[] _listFonts() { return fontList; }