WritableRaster adds 秘pix element for direct writing

hansonr · hansonr · commit 9c9900a84507 · 2019-07-12T14:31:01.000+01:00
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
@@ -978,6 +978,12 @@ public static WritableRaster createWritableRaster(SampleModel sm,
         }
 
         int dataType = sm.getDataType();
+
+        if (dataType == DataBuffer.TYPE_INT) { // SwingJS
+            SunWritableRaster r = new SunWritableRaster(sm,db,location);
+            r.秘pix = SunWritableRaster.stealData((DataBufferInt) db, 0);
+            return r;
+        }
 //
 //        if (sm instanceof PixelInterleavedSampleModel) {
 //            switch(dataType) {
@@ -1007,7 +1013,7 @@ public static WritableRaster createWritableRaster(SampleModel sm,
 
         // we couldn't do anything special - do the generic thing
 
-        return new SunWritableRaster(sm,db,location);
+        return new BytePackedRaster(sm, db, location);
     }
 
     /**
diff --git a/sources/net.sf.j2s.java.core/src/sun/awt/image/SunWritableRaster.java b/sources/net.sf.j2s.java.core/src/sun/awt/image/SunWritableRaster.java
@@ -48,6 +48,8 @@
 
 public class SunWritableRaster extends WritableRaster {
 	private static DataStealer stealer;
+	
+	public int[] 秘pix;
 
 	private static DataStealer getStealer() {
 		return (stealer == null ? stealer = new DataStealer() {
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSGraphics2D.java b/sources/net.sf.j2s.java.core/src/swingjs/JSGraphics2D.java
@@ -99,6 +99,9 @@ public class JSGraphics2D implements
 										 *            ctx.backingStorePixelRatio || 1; return dpr / bsr; })() ||
 										 */
 			1;
+	static {
+		System.out.println("JSGraphics2D pixelRatio is " + pixelRatio);
+	}
 // this is 1.5 for Windows
 // nice, but now how would be do raw pixel setting, say, from images?
 //    can.width = w * pixelRatio;
@@ -468,6 +471,14 @@ private void doRoundRect(int x, int y, int w, int h, int aw, int ah, int mode) {
 			draw(rrect);
 	}
 
+	/**
+	 * Allows for direct image transfer by buffer
+	 * @param img
+	 * @param x
+	 * @param y
+	 * @param observer
+	 * @return
+	 */
 	public boolean drawImage(Image img, int x, int y, ImageObserver observer) {
 		return drawImagePriv(img, x, y, observer);
 	}
@@ -496,10 +507,10 @@ private void observe(Image img, ImageObserver observer, boolean isOK) {
 		observer.imageUpdate(img, (isOK ? 0 : ImageObserver.ABORT | ImageObserver.ERROR), -1, -1, -1, -1);
 	}
 
-	public boolean drawImage(Image img, int x, int y, Color bgcolor, ImageObserver observer) {
-//		backgroundPainted = true;
-		return drawImage(img, x, y, observer);
-	}
+//	public boolean drawImage(Image img, int x, int y, Color bgcolor, ImageObserver observer) {
+////		backgroundPainted = true;
+//		return drawImage(img, x, y, observer);
+//	}
 
 	public boolean drawImage(Image img, int x, int y, int width, int height, Color bgcolor, ImageObserver observer) {
 		if (width <= 0 || height <= 0)
@@ -563,7 +574,7 @@ public boolean drawImagePriv(Image img, int x, int y, ImageObserver observer) {
 			/**
 			 * @j2sNative
 			 * 
-			 * 			pixels = img.秘pix; isRGB = (img.imageType == 1);
+			 * 			pixels = img.raster.秘pix ||img.秘pix; isRGB = (img.imageType == 1);
 			 *
 			 */
 			DOMNode imgNode = null;
@@ -582,13 +593,7 @@ public boolean drawImagePriv(Image img, int x, int y, ImageObserver observer) {
 		return true;
 	}
 
-	public void drawDirectRGBA(int[] pixels) {
-		// this can go VERY fast - for writing directly to the canvas context
-//		backgroundPainted = true;
-		drawDirect(pixels, 0, 0, width, height, false);
-	}
-
-	private void drawDirect(int[] pixels, int x, int y, int width, int height, boolean isRGB) {
+	public void drawDirect(int[] pixels, int x, int y, int width, int height, boolean isRGB) {
 		if (buf8 == null || x != lastx || y != lasty || nx != width || ny != height) {
 			imageData = ctx.getImageData(x, y, width, height);
 			buf8 = imageData.data;
