Merge branch 'develop' into devsecops

aleks-ivanov · aleks-ivanov · commit e4b26f412835 · 2024-10-29T03:11:34.000Z
diff --git a/itext.tests/itext.svg.tests/itext/svg/converter/SvgConverterIntegrationTest.cs b/itext.tests/itext.svg.tests/itext/svg/converter/SvgConverterIntegrationTest.cs
@@ -526,5 +526,10 @@ public virtual void ParseDoubleValues() {
             // So this test checks if there are any differences
             ConvertAndCompare(sourceFolder, destinationFolder, "svgStackOver");
         }
+
+        [NUnit.Framework.Test]
+        public virtual void ParsePathWithNewLinesTest() {
+            ConvertAndCompareSinglePage(sourceFolder, destinationFolder, "pathWithNewLines");
+        }
     }
 }
diff --git a/itext.tests/itext.svg.tests/resources/itext/svg/converter/SvgConverterTest/cmp_pathWithNewLines.pdf b/itext.tests/itext.svg.tests/resources/itext/svg/converter/SvgConverterTest/cmp_pathWithNewLines.pdf
diff --git a/itext.tests/itext.svg.tests/resources/itext/svg/converter/SvgConverterTest/pathWithNewLines.svg b/itext.tests/itext.svg.tests/resources/itext/svg/converter/SvgConverterTest/pathWithNewLines.svg
@@ -0,0 +1,7 @@
+<svg width="200" height="200" xmlns="http://www.w3.org/2000/svg">
+    <path d="M171.081,138.285l77.362-7.749l-91.455-8.623l30.157-35.326l-47.89,
+                         23.827l-4.503-10.37l-9.31-99.998l-9.708,110.734L79.081,81.749l19.337,
+                         40.185l-98.37,9.564l87.204,7.983l-31.559,35.816l52.541-25.082l-13.025,
+                         34.759 l22.846-15.257l8.347,81.941l8.38-87.381l32.2,35.213l-17.627-50.278l36.982,
+                         10.762l-15.258-21.69z"/>
+</svg>
diff --git a/itext/itext.svg/itext/svg/renderers/impl/PathSvgNodeRenderer.cs b/itext/itext.svg/itext/svg/renderers/impl/PathSvgNodeRenderer.cs
@@ -343,6 +343,7 @@ internal virtual ICollection<String> ParsePathOperations() {
                 throw new SvgProcessingException(SvgExceptionMessageConstant.INVALID_PATH_D_ATTRIBUTE_OPERATORS).SetMessageParams
                     (pathString);
             }
+            pathString = iText.Commons.Utils.StringUtil.ReplaceAll(pathString, "\\s+", " ").Trim();
             String[] operators = SplitPathStringIntoOperators(pathString);
             foreach (String inst in operators) {
                 String instTrim = inst.Trim();
diff --git a/port-hash b/port-hash
@@ -1 +1 @@
-d7b7288459c53470547f639cf5386cb2636c2eca
+37dda083dcfd94979087cd526aa7936c74c4fdc7

Original file line number	Diff line number	Diff line change
`@@ -526,5 +526,10 @@ public virtual void ParseDoubleValues() {`
`526`	`526`	`// So this test checks if there are any differences`
`527`	`527`	`ConvertAndCompare(sourceFolder, destinationFolder, "svgStackOver");`
`528`	`528`	`}`
	`529`	`+`
	`530`	`+ [NUnit.Framework.Test]`
	`531`	`+ public virtual void ParsePathWithNewLinesTest() {`
	`532`	`+ ConvertAndCompareSinglePage(sourceFolder, destinationFolder, "pathWithNewLines");`
	`533`	`+ }`
`529`	`534`	`}`
`530`	`535`	`}`
Original file line number	Diff line number	Diff line change
`@@ -343,6 +343,7 @@ internal virtual ICollection<String> ParsePathOperations() {`
`343`	`343`	`throw new SvgProcessingException(SvgExceptionMessageConstant.INVALID_PATH_D_ATTRIBUTE_OPERATORS).SetMessageParams`
`344`	`344`	`(pathString);`
`345`	`345`	`}`
	`346`	`+ pathString = iText.Commons.Utils.StringUtil.ReplaceAll(pathString, "\\s+", " ").Trim();`
`346`	`347`	`String[] operators = SplitPathStringIntoOperators(pathString);`
`347`	`348`	`foreach (String inst in operators) {`
`348`	`349`	`String instTrim = inst.Trim();`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-d7b7288459c53470547f639cf5386cb2636c2eca`
	`1`	`+37dda083dcfd94979087cd526aa7936c74c4fdc7`