Fixes and tests for Svgs without dimensions

RND-1011

Author: Samuel Huylebroeck

src/main/java/com/itextpdf/html2pdf/util/SvgProcessingUtil.java

@@ -49,6 +49,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.element.Image;
 import com.itextpdf.html2pdf.html.AttributeConstants;
 import com.itextpdf.styledxmlparser.css.util.CssUtils;
+import com.itextpdf.svg.converter.SvgConverter;
 import com.itextpdf.svg.processors.ISvgProcessorResult;
 import com.itextpdf.svg.renderers.ISvgNodeRenderer;
 import com.itextpdf.svg.renderers.SvgDrawContext;
@@ -69,8 +70,10 @@ public class SvgProcessingUtil {
      */
     public Image createImageFromProcessingResult(ISvgProcessorResult result, PdfDocument pdfDocument){
         ISvgNodeRenderer topSvgRenderer = result.getRootRenderer();
-        float width = CssUtils.parseAbsoluteLength(topSvgRenderer.getAttribute(AttributeConstants.WIDTH));
-        float height = CssUtils.parseAbsoluteLength(topSvgRenderer.getAttribute(AttributeConstants.HEIGHT));
+        float width, height;
+        float[] wh = SvgConverter.extractWidthAndHeight(topSvgRenderer);
+        width = wh[0];
+        height=wh[1];
         PdfFormXObject pdfForm = new PdfFormXObject(new Rectangle(0, 0, width, height));
         PdfCanvas canvas = new PdfCanvas(pdfForm, pdfDocument);
 

src/test/java/com/itextpdf/html2pdf/element/SvgTest.java

@@ -45,6 +45,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.HtmlConverter;
 import com.itextpdf.styledxmlparser.LogMessageConstant;
 import com.itextpdf.kernel.utils.CompareTool;
+import com.itextpdf.svg.exceptions.SvgLogMessageConstant;
 import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.LogMessage;
 import com.itextpdf.test.annotations.LogMessages;
@@ -151,4 +152,37 @@ public void externalObjectNonExistentRefTest() throws IOException, InterruptedEx
         HtmlConverter.convertToPdf(new File(sourceFolder + name + ".html"), new File(destinationFolder + name + ".pdf"));
         Assert.assertNull(new CompareTool().compareByContent(destinationFolder + name + ".pdf", sourceFolder + "cmp_" + name + ".pdf", destinationFolder, "diff_" + name + "_"));
     }
+
+    @Test
+    @LogMessages(messages = {
+            @LogMessage(messageTemplate = SvgLogMessageConstant.MISSING_WIDTH),
+            @LogMessage(messageTemplate = SvgLogMessageConstant.MISSING_HEIGHT),
+    })
+    public void SvgWithoutDimensionsTest() throws IOException, InterruptedException {
+        String name = "svg_without_dimensions";
+        HtmlConverter.convertToPdf(new File(sourceFolder + name + ".html"), new File(destinationFolder + name + ".pdf"));
+        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + name + ".pdf", sourceFolder + "cmp_" + name + ".pdf", destinationFolder, "diff_" + name + "_"));
+    }
+    @Test
+    @LogMessages(messages = {
+            @LogMessage(messageTemplate = SvgLogMessageConstant.MISSING_WIDTH),
+            @LogMessage(messageTemplate = SvgLogMessageConstant.MISSING_HEIGHT),
+    })
+    public void SvgWithoutDimensionsWithViewboxTest() throws IOException, InterruptedException {
+        String name = "svg_without_dimensions_with_viewbox";
+        HtmlConverter.convertToPdf(new File(sourceFolder + name + ".html"), new File(destinationFolder + name + ".pdf"));
+        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + name + ".pdf", sourceFolder + "cmp_" + name + ".pdf", destinationFolder, "diff_" + name + "_"));
+    }
+
+    @Test
+    @LogMessages(messages = {
+            @LogMessage(messageTemplate = SvgLogMessageConstant.MISSING_WIDTH, count = 2),
+            @LogMessage(messageTemplate = SvgLogMessageConstant.MISSING_HEIGHT, count = 2),
+    })
+    public void SvgWithoutDimensionsImageAndObjectRef() throws IOException, InterruptedException {
+        String name = "SvgWithoutDimensionsImageAndObjectRef";
+        HtmlConverter.convertToPdf(new File(sourceFolder + name + ".html"), new File(destinationFolder + name + ".pdf"));
+        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + name + ".pdf", sourceFolder + "cmp_" + name + ".pdf", destinationFolder, "diff_" + name + "_"));
+    }
+
 }

src/test/resources/com/itextpdf/html2pdf/element/SvgTest/SvgWithoutDimensionsImageAndObjectRef.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Example</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+<body>
+<h1>HTML5 SVG Demo</h1>
+<p> Example Image</p>
+<img src="resources/widthHeightNotDefined.svg" />
+<p>Example Object1</p>
+<object data="resources/widthHeightNotDefined.svg" type="image/svg+xml"></object>
+</body>
+</html>

src/test/resources/com/itextpdf/html2pdf/element/SvgTest/cmp_SvgWithoutDimensionsImageAndObjectRef.pdf

@@ -0,0 +1,16 @@
+<html>
+<head>
+<title>Inline SVG</title>
+</head>
+<body>
+<p>Svg completly defined inside the html below</p>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1">
+    <rect width="500" height="400" fill="none" stroke="black"/>
+    <line x1="0" y1="0" x2="20" y2="135" stroke="black"/>
+    <circle cx="20" cy="135" r="5" fill="none" stroke="black"/>
+    <text x="20" y="135" font-family="Verdana" font-size="35">
+        Hello world
+    </text>
+</svg>
+</body>
+</html>

src/test/resources/com/itextpdf/html2pdf/element/SvgTest/cmp_svg_without_dimensions.pdf

@@ -0,0 +1,16 @@
+<html>
+<head>
+<title>Inline SVG</title>
+</head>
+<body>
+<p>Svg completly defined inside the html below</p>
+<svg viewbox="0 0 50 100" xmlns="http://www.w3.org/2000/svg" version="1.1">
+    <rect width="500" height="400" fill="none" stroke="black"/>
+    <line x1="0" y1="0" x2="20" y2="135" stroke="black"/>
+    <circle cx="20" cy="135" r="5" fill="none" stroke="black"/>
+    <text x="20" y="135" font-family="Verdana" font-size="35">
+        Hello world
+    </text>
+</svg>
+</body>
+</html>