better check for having pixels in an image

BobHanson · BobHanson · commit 47cf74c8e94a · 2018-02-22T14:50:48.000-06:00
The issue will be if the developer is using raw raster calls to change
an image. One must call image.checkHavePixels() and possibly even set
image._havePix false first to force the reading of the HTML5 canvas
pixels into the image raster data.
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
@@ -322,6 +322,7 @@ public BufferedImage(int width, int height, int imageType) {
 					0x0 // Alpha
 			);
 			raster = colorModel.createCompatibleWritableRaster(width, height);
+			raster.setImage(this);
 			_pix = ((DataBufferInt) raster.getDataBuffer()).data;
 		}
 			break;
@@ -330,6 +331,7 @@ public BufferedImage(int width, int height, int imageType) {
 		case TYPE_INT_ARGB: {
 			colorModel = ColorModel.getRGBdefault();
 			raster = colorModel.createCompatibleWritableRaster(width, height);
+			raster.setImage(this);
 			_pix = ((DataBufferInt) raster.getDataBuffer()).data;
 		}
 			break;
@@ -631,6 +633,7 @@ public BufferedImage(ColorModel cm, WritableRaster raster,
 
 		colorModel = cm;
 		this.raster = raster;
+		raster.setImage(this);
 		_pix = ((DataBufferInt) raster.getDataBuffer()).data;
 		this.properties = properties;
 		// int numBands = raster.getNumBands();
@@ -837,7 +840,6 @@ public ColorModel getColorModel() {
 	 *         .
 	 */
 	public WritableRaster getRaster() {
-		checkHavePixels();
 		return raster;
 	}
 
@@ -946,7 +948,7 @@ public int[] getRGB(int startX, int startY, int w, int h, int[] rgbArray, int of
 	 * 
 	 * @return true if pixels had to be set
 	 */
-	private boolean checkHavePixels() {
+	public boolean checkHavePixels() {
 		if ((_imgNode != null || _g != null) && !_havePix) {
 			setPixels();
 			return true;
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/image/Raster.java b/sources/net.sf.j2s.java.core/src/java/awt/image/Raster.java
@@ -125,6 +125,12 @@
 
 public class Raster {
 
+	private BufferedImage image;
+
+	public void setImage(BufferedImage image) {
+		this.image = image;
+	}
+
     /**
      * The SampleModel that describes how pixels from this Raster
      * are stored in the DataBuffer.
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/image/WritableRaster.java b/sources/net.sf.j2s.java.core/src/java/awt/image/WritableRaster.java
@@ -50,7 +50,7 @@
  * in the Raster class.
  */
 public class WritableRaster extends Raster {
-
+	
 	public void setParams(SampleModel model,
 			DataBuffer dataBuffer, Point origin) {
 		// for subclasses IntegerInterleaved and ByteInterleaved 
diff --git a/sources/net.sf.j2s.java.core/src/sun/awt/image/OffScreenImageSource.java b/sources/net.sf.j2s.java.core/src/sun/awt/image/OffScreenImageSource.java
@@ -97,6 +97,7 @@ public void requestTopDownLeftRightResend(ImageConsumer ic) {
 
     private void sendPixels() {
         ColorModel cm = image.getColorModel();
+		image.checkHavePixels();
         WritableRaster raster = image.getRaster();
         int numDataElements = raster.getNumDataElements();
         int dataType = raster.getDataBuffer().getDataType();
