Fixed freehep#33

Repaired SVG clipping: Non-working PathIterator reuse is replaced by creating two PathIterators from a shape.
benediktmu · Mar 21, 2016 · ffedf24 · ffedf24
1 parent 25e9edc
commit ffedf24
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/freehep-graphicsio-svg/src/main/java/org/freehep/graphicsio/svg/SVGGraphics2D.java b/freehep-graphicsio-svg/src/main/java/org/freehep/graphicsio/svg/SVGGraphics2D.java
@@ -446,7 +446,7 @@ public void draw(Shape shape) {
             style.put("fill", "none");
             style.putAll(getStrokeProperties(getStroke(), false));
 
-            writePathIterator(path, style);
+            writePathIterator(shape, style);
         } else if (getStroke() != null) {
             // fill the shape created by stroke
             fill(getStroke().createStrokedShape(shape));
@@ -486,18 +486,18 @@ public void fill(Shape shape) {
             // no border
             style.put("stroke", "none");
 
-            writePathIterator(path, style);
+            writePathIterator(shape, style);
         }
     }
 
     /**
-     * writes a path using {@link #getPath(java.awt.geom.PathIterator)}
+     * writes a shape's path using {@link #getPath(java.awt.geom.PathIterator)}
      * and the given style
      *
-     * @param pi PathIterator
+     * @param shape The shape to get a PathIterator from
      * @param style Properties for <g> tag
      */
-    private void writePathIterator(PathIterator pi, Properties style) {
+    private void writePathIterator(Shape shape, Properties style) {
         StringBuffer result = new StringBuffer();
 
         // write style
@@ -506,6 +506,7 @@ private void writePathIterator(PathIterator pi, Properties style) {
         result.append(">\n  ");
 
         // draw shape
+        PathIterator pi = shape.getPathIterator(null);
         result.append(getPath(pi));
 
         // close style
@@ -516,6 +517,8 @@ private void writePathIterator(PathIterator pi, Properties style) {
         // test if clip intersects pi
         if (getClip() != null) {
             GeneralPath gp = new GeneralPath();
+
+            pi = shape.getPathIterator(null);
             gp.append(pi, true);
             // create the stroked shape
             Stroke stroke = getStroke() == null? defaultStroke : getStroke();