Fix not closed path in polygon, circle and ellipse

DEVSIX-2719, DEVSIX-3932

Author: Dmitry Radchuk

svg/src/main/java/com/itextpdf/svg/renderers/impl/AbstractSvgNodeRenderer.java

@@ -319,21 +319,7 @@ void postDraw(SvgDrawContext context) {
             if (getParentClipPath() == null) {
                 if (doFill && canElementFill()) {
                     String fillRuleRawValue = getAttribute(SvgConstants.Attributes.FILL_RULE);
-
-                    if (SvgConstants.Values.FILL_RULE_EVEN_ODD.equalsIgnoreCase(fillRuleRawValue)) {
-                        if (doStroke) {
-                            currentCanvas.eoFillStroke();
-                        } else {
-                            currentCanvas.eoFill();
-                        }
-                    } else {
-                        if (doStroke) {
-                            // TODO DEVSIX-8854 Draw SVG elements with transparent stroke in 2 steps
-                            currentCanvas.fillStroke();
-                        } else {
-                            currentCanvas.fill();
-                        }
-                    }
+                    doStrokeOrFill(fillRuleRawValue, currentCanvas);
                 } else if (doStroke) {
                     currentCanvas.stroke();
                 } else {
@@ -360,6 +346,29 @@ void postDraw(SvgDrawContext context) {
         }
     }
 
+    /**
+     * Do stroke or fill based on {@code doFill/doStroke} fields.
+     *
+     * @param fillRuleRawValue fill rule attribute value.
+     * @param currentCanvas current canvas to draw on.
+     */
+    void doStrokeOrFill(String fillRuleRawValue, PdfCanvas currentCanvas) {
+        if (SvgConstants.Values.FILL_RULE_EVEN_ODD.equalsIgnoreCase(fillRuleRawValue)) {
+            if (doStroke) {
+                currentCanvas.eoFillStroke();
+            } else {
+                currentCanvas.eoFill();
+            }
+        } else {
+            if (doStroke) {
+                // TODO DEVSIX-8854 Draw SVG elements with transparent stroke in 2 steps
+                currentCanvas.fillStroke();
+            } else {
+                currentCanvas.fill();
+            }
+        }
+    }
+
     /**
      * Operations to perform before drawing an element.
      * This includes setting stroke color and width, fill color.

svg/src/main/java/com/itextpdf/svg/renderers/impl/EllipseSvgNodeRenderer.java

@@ -117,4 +117,9 @@ public ISvgNodeRenderer createDeepCopy() {
         return copy;
     }
 
+    @Override
+    void doStrokeOrFill(String fillRuleRawValue, PdfCanvas currentCanvas) {
+        DrawUtils.doStrokeOrFillForClosedFigure(fillRuleRawValue, currentCanvas, doStroke);
+    }
+
 }

svg/src/main/java/com/itextpdf/svg/renderers/impl/PolygonSvgNodeRenderer.java

@@ -23,8 +23,11 @@ This file is part of the iText (R) project.
 package com.itextpdf.svg.renderers.impl;
 
 import com.itextpdf.kernel.geom.Point;
+import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
+import com.itextpdf.svg.SvgConstants;
 import com.itextpdf.svg.renderers.IMarkerCapable;
 import com.itextpdf.svg.renderers.ISvgNodeRenderer;
+import com.itextpdf.svg.utils.DrawUtils;
 
 /**
  * {@link ISvgNodeRenderer} implementation for the <polygon> tag.
@@ -62,4 +65,9 @@ public ISvgNodeRenderer createDeepCopy() {
         deepCopyAttributesAndStyles(copy);
         return copy;
     }
+
+    @Override
+    void doStrokeOrFill(String fillRuleRawValue, PdfCanvas currentCanvas) {
+        DrawUtils.doStrokeOrFillForClosedFigure(fillRuleRawValue, currentCanvas, doStroke);
+    }
 }

svg/src/main/java/com/itextpdf/svg/utils/DrawUtils.java

@@ -23,6 +23,7 @@ This file is part of the iText (R) project.
 package com.itextpdf.svg.utils;
 
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
+import com.itextpdf.svg.SvgConstants;
 
 import java.util.List;
 
@@ -53,4 +54,27 @@ public static void arc(final double x1, final double y1, final double x2, final
             }
         }
     }
+
+    /**
+     * Perform stroke or fill operation for closed figure (e.g. Ellipse, Polygon, Circle).
+     *
+     * @param fillRuleRawValue fill rule (e.g. evenodd, nonzero)
+     * @param currentCanvas canvas to draw on
+     * @param doStroke if true, stroke operation will be performed, fill otherwise
+     */
+    public static void doStrokeOrFillForClosedFigure(String fillRuleRawValue, PdfCanvas currentCanvas, boolean doStroke) {
+        if (SvgConstants.Values.FILL_RULE_EVEN_ODD.equalsIgnoreCase(fillRuleRawValue)) {
+            if (doStroke) {
+                currentCanvas.closePathEoFillStroke();
+            } else {
+                currentCanvas.eoFill();
+            }
+        } else {
+            if (doStroke) {
+                currentCanvas.closePathFillStroke();
+            } else {
+                currentCanvas.fill();
+            }
+        }
+    }
 }

svg/src/test/java/com/itextpdf/svg/renderers/impl/CircleNodeRendererIntegrationTest.java

@@ -122,7 +122,6 @@ public void circleSkewYTest() throws IOException, InterruptedException, java.io.
     }
 
     @Test
-    // TODO: DEVSIX-3932 update cmp_ after fix
     public void circleWithBigStrokeWidthTest() throws IOException, InterruptedException, java.io.IOException {
         convertAndCompare(sourceFolder, destinationFolder, "circleWithBigStrokeWidth");
     }

svg/src/test/java/com/itextpdf/svg/renderers/impl/EllipseSvgNodeRendererIntegrationTest.java

@@ -171,7 +171,6 @@ public void parseParametersAndCalculateCoordinatesWithBetterPrecisionEllipseTest
     }
 
     @Test
-    // TODO: DEVSIX-3932 update cmp_ after fix
     public void ellipseWithBigStrokeWidthTest() throws IOException, InterruptedException, java.io.IOException {
         convertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "ellipseWithBigStrokeWidth");
     }

svg/src/test/java/com/itextpdf/svg/renderers/impl/LinearGradientSvgNodeRendererTest.java

@@ -47,13 +47,11 @@ public static void beforeClass() {
         ITextTest.createOrClearDestinationFolder(destinationFolder);
     }
 
-    // TODO: DEVSIX-3932 update cmp_ after fix
     @Test
     public void circleTest() throws IOException, InterruptedException, java.io.IOException {
         convertAndCompare(sourceFolder, destinationFolder, "circle");
     }
 
-    // TODO: DEVSIX-3932 update cmp_ after fix
     @Test
     public void ellipseTest() throws IOException, InterruptedException, java.io.IOException {
         convertAndCompare(sourceFolder, destinationFolder, "ellipse");
@@ -241,7 +239,6 @@ public void arcInsideOtherEllipticalArcTest() throws IOException, InterruptedExc
         convertAndCompare(sourceFolder, destinationFolder, "arcInsideOtherEllipticalArc");
     }
 
-    // TODO: DEVSIX-3932 update cmp_ after fix
     @Test
     public void polygonTest() throws IOException, InterruptedException, java.io.IOException {
         convertAndCompare(sourceFolder, destinationFolder, "polygon");

svg/src/test/java/com/itextpdf/svg/renderers/impl/MarkerSvgNodeRendererIntegrationTest.java

@@ -127,7 +127,6 @@ public void markerInPolylineElementTest() throws IOException, InterruptedExcepti
     }
 
     @Test
-    // TODO: update when DEVSIX-2719 will be closed
     public void markerInPolygonElementTest() throws IOException, InterruptedException {
         convertAndCompareSinglePage(SOURCE_FOLDER, DESTINATION_FOLDER, "markerInPolygonElement");
     }

svg/src/test/java/com/itextpdf/svg/renderers/impl/PathSvgNodeRendererTest.java

@@ -478,4 +478,9 @@ public void patternHrefTransitivePresAR1Test() throws IOException, InterruptedEx
     public void patternHrefTransitivePresAR2Test() throws IOException, InterruptedException {
         convertAndCompareSinglePage(sourceFolder, destinationFolder, "patternHrefTransitivePresAR2", properties);
     }
+
+    @Test
+    public void closedPathIsCutTest() throws IOException, InterruptedException {
+        convertAndCompareSinglePage(sourceFolder, destinationFolder, "closedPathIsCutTest", properties);
+    }
 }

svg/src/test/java/com/itextpdf/svg/renderers/impl/PolygonSvgNodeRendererTest.java

@@ -182,4 +182,14 @@ public void connectPointsWithSameYCoordinateTest() {
             Assertions.assertEquals(expectedPoints.get(x), attributePoints.get(x));
         }
     }
+
+    @Test
+    public void polygonIsNotCutTest() throws IOException, InterruptedException {
+        convertAndCompareSinglePage(sourceFolder, destinationFolder, "polygonIsNotCutTest");
+    }
+
+    @Test
+    public void polygonIsNotCutEvenOddTest() throws IOException, InterruptedException {
+        convertAndCompareSinglePage(sourceFolder, destinationFolder, "polygonIsNotCutEvenOddTest");
+    }
 }