fix of optimization of JSGraphics2D AffineTransform save/restore

BobHanson · BobHanson · commit b60190b61006 · 2023-12-14T07:43:15.000-07:00
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/geom/AffineTransform.java b/sources/net.sf.j2s.java.core/src/java/awt/geom/AffineTransform.java
@@ -3987,6 +3987,22 @@ public boolean equals(Object obj) {
                 (m10 == a.m10) && (m11 == a.m11) && (m12 == a.m12));
     }
 
+	public double[] 秘toArray() {
+		return new double[] {m00, m01, m02, m10, m11, m12, state, type };
+	}
+
+	public AffineTransform 秘fromArray(double[] a) {
+		m00 = a[0];
+		m01 = a[1];
+		m02 = a[2];
+		m10 = a[3];
+		m11 = a[4];
+		m12 = a[5];
+		state = (int) a[6];
+		type = (int) a[7];
+		return this;
+	}
+
     /* Serialization support.  A readObject method is neccessary because
      * the state field is part of the implementation of this particular
      * AffineTransform and not part of the public specification.  The
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSGraphics2D.java b/sources/net.sf.j2s.java.core/src/swingjs/JSGraphics2D.java
@@ -1287,7 +1287,7 @@ private int mark(boolean isClone) {
 		map[SAVE_ALPHA] = (/** @j2sNative 1 ? this.ctx.globalAlpha : */0);//Float.valueOf(ctx.globalAlpha);
 		map[SAVE_COMPOSITE] = alphaComposite;
 		map[SAVE_STROKE] = currentStroke;
-		map[SAVE_TRANSFORM] = transform;
+		map[SAVE_TRANSFORM] = transform.秘toArray();
 		map[SAVE_FONT] = font;
 		map[SAVE_CLIP] = currentClip;
 		return HTML5CanvasContext2D.push(ctx, map);
@@ -1360,7 +1360,7 @@ private void setState(Object[] map) {
 		setAlpha(/** @j2sNative map[a] || */0);
 		shader = null;
 		setStroke((Stroke) map[SAVE_STROKE]);
-		setTransform((AffineTransform) map[SAVE_TRANSFORM]);
+		setTransform(transform.秘fromArray((double[]) map[SAVE_TRANSFORM]));
 		setFont((Font) map[SAVE_FONT]);
 		currentClip = (Shape) map[SAVE_CLIP];
 	}
