Fix rx/ry handling of Ellipse and Rectangle svg objects

DEVSIX-3119, DEVSIX-3121

Author: Dmitry Radchuk

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

@@ -81,8 +81,16 @@ protected boolean setParameters() {
      */
     protected boolean setParameters(SvgDrawContext context) {
         initCenter(context);
-        rx = parseHorizontalLength(getAttribute(SvgConstants.Attributes.RX), context);
-        ry = parseVerticalLength(getAttribute(SvgConstants.Attributes.RY), context);
+        String rxValue = getAttribute(SvgConstants.Attributes.RX);
+        String ryValue = getAttribute(SvgConstants.Attributes.RY);
+        rx = parseHorizontalLength(rxValue, context);
+        ry = parseVerticalLength(ryValue, context);
+        if (rxValue == null) {
+            rx = ry;
+        }
+        if (ryValue == null) {
+            ry = rx;
+        }
         return rx > 0.0F && ry > 0.0F;
     }
 

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

@@ -117,12 +117,14 @@ private void setParameters(SvgDrawContext context) {
         height = parseVerticalLength(getAttribute(SvgConstants.Attributes.HEIGHT), context);
 
         if (attributesAndStyles.containsKey(SvgConstants.Attributes.RX)) {
-            rx = checkRadius(parseHorizontalLength(getAttribute(SvgConstants.Attributes.RX), context), width);
-            rxPresent = true;
+            float rawRadius =parseHorizontalLength(getAttribute(SvgConstants.Attributes.RX), context);
+            rx = checkRadius(rawRadius, width);
+            rxPresent = rawRadius >= 0.0f;
         }
         if (attributesAndStyles.containsKey(SvgConstants.Attributes.RY)) {
-            ry = checkRadius(parseVerticalLength(getAttribute(SvgConstants.Attributes.RY), context), height);
-            ryPresent = true;
+            float rawRadius = parseVerticalLength(getAttribute(SvgConstants.Attributes.RY), context);
+            ry = checkRadius(rawRadius, height);
+            ryPresent = rawRadius >= 0.0f;
         }
     }
 

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

@@ -82,13 +82,11 @@ public void ellipseCyAbsentTest() throws IOException, InterruptedException, java
     }
 
     @Test
-    //TODO: update cmp_ when DEVSIX-3119
     public void ellipseRxAbsentTest() throws IOException, InterruptedException, java.io.IOException {
         convertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "ellipseRxAbsent");
     }
 
     @Test
-    //TODO: update cmp_ when DEVSIX-3119
     public void ellipseRyAbsentTest() throws IOException, InterruptedException, java.io.IOException {
         convertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "ellipseRyAbsent");
     }

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

@@ -95,13 +95,11 @@ public void basicEllipticalHeightCappedRoundedRectangleTest() throws IOException
     }
 
     @Test
-    //TODO change cmp-file after DEVSIX-3121 fixed
     public void basicEllipticalNegativeWidthRoundedRectangleTest() throws IOException, InterruptedException {
         convertAndCompare(sourceFolder, destinationFolder, "basicEllipticalNegativeWidthRoundedRectangle");
     }
 
     @Test
-    //TODO change cmp-file after DEVSIX-3121 fixed
     public void basicEllipticalNegativeHeightRoundedRectangleTest() throws IOException, InterruptedException {
         convertAndCompare(sourceFolder, destinationFolder, "basicEllipticalNegativeHeightRoundedRectangle");}