GraphicsConfiguration fix for STABLE BufferedImage;Character.toString(c)

hansonr · hansonr · commit 1f2922e746d2 · 2020-07-18T21:31:44.000-05:00
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20200715193703 
+20200718212919 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp
@@ -1 +1 @@
-20200715193703 
+20200718212919 
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/GraphicsConfiguration.java b/sources/net.sf.j2s.java.core/src/java/awt/GraphicsConfiguration.java
@@ -186,9 +186,11 @@ public BufferedImage createCompatibleImage(int width, int height,
     }
 
 
-	protected BufferedImage newBufferedImage(ColorModel cm, WritableRaster wr,
-			boolean alphaPremultiplied, Hashtable<?, ?> properties) {
-		return new BufferedImage(cm, wr, alphaPremultiplied, properties);
+	protected BufferedImage newBufferedImage(ColorModel cm, WritableRaster wr, boolean alphaPremultiplied,
+			Hashtable<?, ?> properties) {
+		BufferedImage bi = new BufferedImage(cm, wr, alphaPremultiplied, properties);
+	    bi.getRaster().秘setStable(true);
+		return bi;
 	}
 
 		/**
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
@@ -1331,7 +1331,7 @@ public Graphics2D createGraphics() {
 			秘g = new JSGraphics2D(秘canvas);
 		}
 
-		if (秘haveRaster()) {
+		if (秘haveRaster() && 秘isDataStolen()) {
 			// we need to draw the image now, because it might
 			// have pixels. Note that Java actually does not
 			// allow creating a Graphics from MemoryImageSource
@@ -1341,7 +1341,7 @@ public Graphics2D createGraphics() {
 		}
 		Object pix = 秘pix;
 		/**
-		 * @j2sNative if (pix) pix.img = this;
+		 * @j2sNative pix && (pix.img = this);
 		 * 
 		 */
 
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
@@ -5365,6 +5365,11 @@ if(radix >= 2 && radix <= 36){
 }
 return -1;
 }, 1);
+
+m$(C$,"toString$C", function(c) {
+	 return c;
+}, 1);
+
 m$(C$,"toString",
 function(c){
 if (arguments.length == 0) {
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
@@ -19366,6 +19366,11 @@ if(radix >= 2 && radix <= 36){
 }
 return -1;
 }, 1);
+
+m$(C$,"toString$C", function(c) {
+	 return c;
+}, 1);
+
 m$(C$,"toString",
 function(c){
 if (arguments.length == 0) {

Original file line number	Diff line number	Diff line change
`@@ -186,9 +186,11 @@ public BufferedImage createCompatibleImage(int width, int height,`
`186`	`186`	`}`
`187`	`187`
`188`	`188`
`189`		`- protected BufferedImage newBufferedImage(ColorModel cm, WritableRaster wr,`
`190`		`- boolean alphaPremultiplied, Hashtable<?, ?> properties) {`
`191`		`- return new BufferedImage(cm, wr, alphaPremultiplied, properties);`
	`189`	`+ protected BufferedImage newBufferedImage(ColorModel cm, WritableRaster wr, boolean alphaPremultiplied,`
	`190`	`+ Hashtable<?, ?> properties) {`
	`191`	`+ BufferedImage bi = new BufferedImage(cm, wr, alphaPremultiplied, properties);`
	`192`	`+ bi.getRaster().秘setStable(true);`
	`193`	`+ return bi;`
`192`	`194`	`}`
`193`	`195`
`194`	`196`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1331,7 +1331,7 @@ public Graphics2D createGraphics() {`
`1331`	`1331`	`秘g = new JSGraphics2D(秘canvas);`
`1332`	`1332`	`}`
`1333`	`1333`
`1334`		`- if (秘haveRaster()) {`
	`1334`	`+ if (秘haveRaster() && 秘isDataStolen()) {`
`1335`	`1335`	`// we need to draw the image now, because it might`
`1336`	`1336`	`// have pixels. Note that Java actually does not`
`1337`	`1337`	`// allow creating a Graphics from MemoryImageSource`
`@@ -1341,7 +1341,7 @@ public Graphics2D createGraphics() {`
`1341`	`1341`	`}`
`1342`	`1342`	`Object pix = 秘pix;`
`1343`	`1343`	`/**`
`1344`		`- * @j2sNative if (pix) pix.img = this;`
	`1344`	`+ * @j2sNative pix && (pix.img = this);`
`1345`	`1345`	`*`
`1346`	`1346`	`*/`
`1347`	`1347`