2002/04/23 02:13:06

darcs-hash:20040130064520-2ba56-e7c1ce1282bac95d01926e52bd9722637c9271b3.gz

diff --git a/CHANGES b/CHANGES
index 7c00770..5ecc16e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -27,3 +27,7 @@
 
 21-Apr megacz src/org/xwt/Surface.java: workaround for GCJ PR java/6393
 
+22-Apr megacz src/org/xwt/plat/Java2.java: fixed bug that caused
+              RasterFormatException on jdk1.4
+
+

diff --git a/src/org/xwt/plat/Java2.java b/src/org/xwt/plat/Java2.java
index f7451c3..9ae2043 100644 (file)
--- a/src/org/xwt/plat/Java2.java
+++ b/src/org/xwt/plat/Java2.java
@@ -122,6 +122,8 @@ public class Java2 extends AWT {
     // This is rumored to be fixed in JDK 1.4.
     protected static void _doDrawImage(Graphics g, Image i, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2, ImageObserver o) {
         
+        if (dx1 == dx2 || dy1 == dy2) return;
+
         if (dx2 - dx1 != sx2 - sx1 || dy2 - dy1 != sy2 - sy1)
             g.drawImage(i, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, o);
         else {