Fixed the transcoding of nested transformations (Fix #3)

ebourg · Jul 5, 2016 · 7a8fe43 · 7a8fe43
1 parent 3ba1ea0
commit 7a8fe43
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/src/main/java/org/pushingpixels/flamingo/api/svg/SvgTranscoder.java b/core/src/main/java/org/pushingpixels/flamingo/api/svg/SvgTranscoder.java
@@ -366,7 +366,7 @@ private void transcodeGraphicsNode(GraphicsNode node, String comment) throws Uns
 
         AffineTransform transform = node.getTransform();
         if (transform != null && !transform.isIdentity()) {
-            printWriter.println("transformations.offer(g.getTransform());");
+            printWriter.println("transformations.push(g.getTransform());");
             printWriter.println("g.transform(" + AffineTransformTranscoder.INSTANCE.transcode(transform) + ");");
         }
 
@@ -388,7 +388,7 @@ private void transcodeGraphicsNode(GraphicsNode node, String comment) throws Uns
         } finally {
             if (transform != null && !transform.isIdentity()) {
                 printWriter.println("");
-                printWriter.println("g.setTransform(transformations.poll()); // " + comment);
+                printWriter.println("g.setTransform(transformations.pop()); // " + comment);
             }
         }
     }

diff --git a/core/src/test/java/transcoded/edit_copy.java b/core/src/test/java/transcoded/edit_copy.java
@@ -40,7 +40,7 @@ public static void paint(Graphics2D g) {
 
         // _0_0
         g.setComposite(AlphaComposite.getInstance(3, 0.49999997f * origAlpha));
-        transformations.offer(g.getTransform());
+        transformations.push(g.getTransform());
         g.transform(new AffineTransform(1.001508f, 0, 0, 1.000616f, -0.05002205f, -0.06304895f));
 
         // _0_0_0
@@ -88,7 +88,7 @@ public static void paint(Graphics2D g) {
         shape = new Rectangle2D.Double(7.016119003295898, 26.03341293334961, 13, 2);
         g.fill(shape);
 
-        g.setTransform(transformations.poll()); // _0_0_0
+        g.setTransform(transformations.pop()); // _0_0_0
         g.setComposite(AlphaComposite.getInstance(3, 1 * origAlpha));
 
         // _0_0_1