Fixing a bug when parsing some SVG files - close #356 (#357)

py-pdf · Mar 8, 2022 · 69f56b6 · 69f56b6
1 parent a67479d
commit 69f56b6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,8 +9,9 @@ and [PEP 440](https://www.python.org/dev/peps/pep-0440/).
 
 ## [2.5.2] - not released yet
 ### Fixed
-- a bug with string width calculation when Markdown is enabled - _cf._ [#351](https://github.com/PyFPDF/fpdf2/issues/351)
 - a regression: now again `multi_cell()` always renders a cell, even if `txt` is an empty string - _cf._ [#349](https://github.com/PyFPDF/fpdf2/issues/349)
+- a bug with string width calculation when Markdown is enabled - _cf._ [#351](https://github.com/PyFPDF/fpdf2/issues/351)
+- a bug when parsing some SVG files - _cf._ [#356](https://github.com/PyFPDF/fpdf2/issues/356)
 
 ## [2.5.1] - 2022-03-07
 ### Added

diff --git a/fpdf/svg.py b/fpdf/svg.py
@@ -737,7 +737,10 @@ def svg_path_converter(pdf_path, svg_path):
                 {"m": "l", "M": "L"}[last_directive_name]
             ]
 
-        numbers, svg_path = _read_n_numbers(svg_path[read_idx:], read_count)
+        if read_count:
+            numbers, svg_path = _read_n_numbers(svg_path[read_idx:], read_count)
+        else:
+            numbers, svg_path = (), svg_path[read_idx:].strip()
 
         last_directive(pdf_path, *numbers)
 

diff --git a/test/svg/generated_pdf/search.pdf b/test/svg/generated_pdf/search.pdf
diff --git a/test/svg/parameters.py b/test/svg/parameters.py
@@ -754,6 +754,7 @@ def Gs(**kwargs):
     pytest.param(svgfile("triangle01.svg"), id="SVG spec triangle01"),
     pytest.param(svgfile("SVG_logo.svg"), id="SVG logo from wikipedia"),
     pytest.param(svgfile("viewbox.svg"), id="weird viewbox"),
+    pytest.param(svgfile("search.svg"), id="search icon"),  # issue 356
 )
 
 svg_path_edge_cases = (

diff --git a/test/svg/svg_sources/search.svg b/test/svg/svg_sources/search.svg