Fixes and tests for Svgs without dimensions

Samuel Huylebroeck · iText-CI · commit 38239c3a5f56 · 2018-09-14T18:09:16.000+03:00
RND-1011

Autoported commit.
Original commit hash: [38a6a47e]
diff --git a/itext.tests/itext.html2pdf.tests/itext/html2pdf/element/SvgTest.cs b/itext.tests/itext.html2pdf.tests/itext/html2pdf/element/SvgTest.cs
@@ -44,6 +44,7 @@ source product.
 using System.IO;
 using iText.Html2pdf;
 using iText.Kernel.Utils;
+using iText.Svg.Exceptions;
 using iText.Test;
 using iText.Test.Attributes;
 
@@ -156,5 +157,44 @@ public virtual void ExternalObjectNonExistentRefTest() {
             NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + name + ".pdf", sourceFolder
                  + "cmp_" + name + ".pdf", destinationFolder, "diff_" + name + "_"));
         }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        [LogMessage(SvgLogMessageConstant.MISSING_WIDTH)]
+        [LogMessage(SvgLogMessageConstant.MISSING_HEIGHT)]
+        public virtual void SvgWithoutDimensionsTest() {
+            String name = "svg_without_dimensions";
+            HtmlConverter.ConvertToPdf(new FileInfo(sourceFolder + name + ".html"), new FileInfo(destinationFolder + name
+                 + ".pdf"));
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + name + ".pdf", sourceFolder
+                 + "cmp_" + name + ".pdf", destinationFolder, "diff_" + name + "_"));
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        [LogMessage(SvgLogMessageConstant.MISSING_WIDTH)]
+        [LogMessage(SvgLogMessageConstant.MISSING_HEIGHT)]
+        public virtual void SvgWithoutDimensionsWithViewboxTest() {
+            String name = "svg_without_dimensions_with_viewbox";
+            HtmlConverter.ConvertToPdf(new FileInfo(sourceFolder + name + ".html"), new FileInfo(destinationFolder + name
+                 + ".pdf"));
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + name + ".pdf", sourceFolder
+                 + "cmp_" + name + ".pdf", destinationFolder, "diff_" + name + "_"));
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        [LogMessage(SvgLogMessageConstant.MISSING_WIDTH, Count = 2)]
+        [LogMessage(SvgLogMessageConstant.MISSING_HEIGHT, Count = 2)]
+        public virtual void SvgWithoutDimensionsImageAndObjectRef() {
+            String name = "SvgWithoutDimensionsImageAndObjectRef";
+            HtmlConverter.ConvertToPdf(new FileInfo(sourceFolder + name + ".html"), new FileInfo(destinationFolder + name
+                 + ".pdf"));
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + name + ".pdf", sourceFolder
+                 + "cmp_" + name + ".pdf", destinationFolder, "diff_" + name + "_"));
+        }
     }
 }
diff --git a/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/element/SvgTest/SvgWithoutDimensionsImageAndObjectRef.html b/itext.tests/itext.html2pdf.tests/resources/itext/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>
diff --git a/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/element/SvgTest/cmp_SvgWithoutDimensionsImageAndObjectRef.pdf b/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/element/SvgTest/cmp_SvgWithoutDimensionsImageAndObjectRef.pdf
diff --git a/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/element/SvgTest/cmp_svg_without_dimensions.pdf b/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/element/SvgTest/cmp_svg_without_dimensions.pdf
diff --git a/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/element/SvgTest/cmp_svg_without_dimensions_with_viewbox.pdf b/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/element/SvgTest/cmp_svg_without_dimensions_with_viewbox.pdf
diff --git a/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/element/SvgTest/resources/widthHeightNotDefined.svg b/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/element/SvgTest/resources/widthHeightNotDefined.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+    <rect x="10" y="10" height="130" width="500" style="fill: #000000"/>
+
+    <rect x="20" y="20" width="300" height="80" style="fill:blue"/>
+
+    <line x1="25" y1="80" x2="350" y2="80"
+          style="stroke: #ffffff; stroke-width: 3;"/>
+</svg>
diff --git a/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/element/SvgTest/svg_without_dimensions.html b/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/element/SvgTest/svg_without_dimensions.html
@@ -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>
diff --git a/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/element/SvgTest/svg_without_dimensions_with_viewbox.html b/itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/element/SvgTest/svg_without_dimensions_with_viewbox.html
@@ -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>
diff --git a/itext/itext.html2pdf/itext/html2pdf/util/SvgProcessingUtil.cs b/itext/itext.html2pdf/itext/html2pdf/util/SvgProcessingUtil.cs
@@ -40,13 +40,12 @@ source product.
 For more information, please contact iText Software Corp. at this
 address: sales@itextpdf.com
 */
-using iText.Html2pdf.Html;
 using iText.Kernel.Geom;
 using iText.Kernel.Pdf;
 using iText.Kernel.Pdf.Canvas;
 using iText.Kernel.Pdf.Xobject;
 using iText.Layout.Element;
-using iText.StyledXmlParser.Css.Util;
+using iText.Svg.Converter;
 using iText.Svg.Processors;
 using iText.Svg.Renderers;
 using iText.Svg.Renderers.Impl;
@@ -66,8 +65,11 @@ public class SvgProcessingUtil {
         /// <returns>image layout object</returns>
         public virtual 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;
+            float 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);
             SvgDrawContext context = new SvgDrawContext(null, result.GetFontProvider());
diff --git a/port-hash b/port-hash
@@ -1 +1 @@
-65a2f712ef541526396b47ad4917bdaec45fadef
+38a6a47e4b60216298f9fbb3a1b63e401cf6862e

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-65a2f712ef541526396b47ad4917bdaec45fadef`
	`1`	`+38a6a47e4b60216298f9fbb3a1b63e401cf6862e`