BufferedImage fix for stolen data

BobHanson · BobHanson · commit da78eb901fe6 · 2021-07-28T17:01:29.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/image/BufferedImage.java b/sources/net.sf.j2s.java.core/src/java/awt/image/BufferedImage.java
@@ -112,7 +112,8 @@
  * @see WritableRaster
  */
 
-public class BufferedImage extends Image implements RenderedImage, Transparency // , WritableRenderedImage
+public class BufferedImage extends Image implements RenderedImage, Transparency, ImageObserver
+// , WritableRenderedImage
 {
 
 	private static final int STATE_UNINITIALIZED = 0;
@@ -1366,7 +1367,7 @@ public Graphics2D createGraphics() {
 			// allow creating a Graphics from MemoryImageSource
 			// so pixels would never be there.
 			if (秘pix != null)
-				秘g.drawImageFromPixelsOrRaster(this, 0, 0, null);
+				秘g.drawImageFromPixelsOrRaster(this, 0, 0, (ImageObserver) this);
 		}
 		Object pix = 秘pix;
 		/**
@@ -1389,8 +1390,11 @@ public Graphics2D createGraphics() {
 	}
 
 	public void 秘graphicsDisposed() {
-		gCount = Math.max(0, gCount - 1);
+		boolean doSync = (秘haveCanvas() && 秘isRasterDirty(false));
 		秘state = STATE_GRAPHICS;
+		if (doSync) {
+			秘syncRaster();
+		}
 	}
 
 	/**
@@ -1404,20 +1408,25 @@ public Graphics2D createGraphics() {
 	 */
 	@Override
 	public void flush() {
-		boolean isStolen = 秘isRasterDirty(false);
-		boolean haveRaster = 秘haveRaster();
-		if (isStolen && !haveRaster)
-			秘ensureRasterUpToDate(); // will set STATE_RASTER
+		boolean setRasterState = 秘syncRaster();
 		if (秘haveRaster() && 秘pix == null) {
 			秘getPixelsFromRaster(0);
 		}
 		秘getImageGraphic();
-		if (isStolen || haveRaster)
+		if (setRasterState)
 			秘state |= STATE_RASTER;
-		while (gCount > 0 && --gCount >= 0)
+		while (gCount-- > 0)
 			秘g.dispose();
 	}
 
+	private boolean 秘syncRaster() {
+		boolean isStolen = 秘isRasterDirty(false);
+		boolean haveRaster = 秘haveRaster();
+		if (isStolen && !haveRaster)
+			秘ensureRasterUpToDate(); // will set STATE_RASTER
+		return (isStolen || haveRaster);
+	}
+
 	/**
 	 * Called only in JavaScript, because we are using this in HTML5Canvas, which is
 	 * a distributed public interface, and the Mandarin char was causing problems.
@@ -2474,4 +2483,10 @@ public String toString() {
 		return new Color(pc.pixelToRgb(pc.rgbToPixel(c.getRGB(), null), null));
 	}
 
+	@Override
+	public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) {
+		// ignored
+		return false;
+	}
+
 }
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSGraphics2D.java b/sources/net.sf.j2s.java.core/src/swingjs/JSGraphics2D.java
@@ -712,7 +712,7 @@ private boolean drawImagePriv(Image img, int x, int y, int width, int height, Im
 		int[] pixels = (int[]) (isTranslationOnly(m) && !isClipped(x,y,width,height) ? ((BufferedImage) img).get秘pixFromRaster() : null);
 		DOMNode imgNode = null;
 		if (pixels == null) {
-			imgNode = ((BufferedImage) img).秘getImageNode(BufferedImage.GET_IMAGE_FROM_RASTER);
+			imgNode = (img == observer ? canvas : ((BufferedImage) img).秘getImageNode(BufferedImage.GET_IMAGE_FROM_RASTER));
 			if (imgNode != null)
 				ctx.drawImage(imgNode, x, y, width, height);
 		} else {
