[Navigate Results, PCB Print, PcbDraw][Added] Support for big SVGs

Workaround for security limitations found in rsvg-convert

Closes #851

Author: set-soft

CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - PCB2Blender_Tools: Experimental v2.17 file generation
 - Report: separated N/PTH slot sizes (#824)
 - VRML: workaround for KiCad 9 randomly failing to copy 3D models (#804)
+- Navigate Results, PCB Print, PcbDraw: Support for big SVGs (#851)
 
 ### Fixed
 - User.N layer numbering. I.e. pcb_print issues with their numbering (#808)

docs/source/Changelog.rst

@@ -37,6 +37,7 @@ Added
 -  Report: separated N/PTH slot sizes (#824)
 -  VRML: workaround for KiCad 9 randomly failing to copy 3D models
    (#804)
+-  Navigate Results, PCB Print, PcbDraw: Support for big SVGs (#851)
 
 Fixed
 ~~~~~

docs/source/dependencies.rst

@@ -89,17 +89,17 @@
    -  Find commit hash and/or date for `sch_replace`
    -  Find commit hash and/or date for `set_text_variables`
 
-`RSVG tools <https://gitlab.gnome.org/GNOME/librsvg>`__ :index:`: <pair: dependency; RSVG tools>`  |image37| |image38| |Auto-download|
+`RSVG tools <https://gitlab.gnome.org/GNOME/librsvg>`__ :index:`: <pair: dependency; RSVG tools>`  v2.40.3 |image37| |image38| |Auto-download|
 
 -  Optional to:
 
-   -  SVG logos for the BoM for `bom`
-   -  Create outputs preview for `navigate_results`
-   -  Create PNG icons for `navigate_results`
-   -  Create outputs preview for `navigate_results_rb`
-   -  Create PNG icons for `navigate_results_rb`
-   -  Create PDF, PNG, PS and EPS formats for `pcb_print`
-   -  Create PNG, JPG and BMP images for `pcbdraw`
+   -  SVG logos for the BoM for `bom` (v2.40.3)
+   -  Create outputs preview for `navigate_results` (v2.40.3)
+   -  Create PNG icons for `navigate_results` (v2.40.3)
+   -  Create outputs preview for `navigate_results_rb` (v2.40.3)
+   -  Create PNG icons for `navigate_results_rb` (v2.40.3)
+   -  Create PDF, PNG, PS and EPS formats for `pcb_print` (v2.40.3)
+   -  Create PNG, JPG and BMP images for `pcbdraw` (v2.40.3)
 
 `ImageMagick <https://imagemagick.org/>`__ :index:`: <pair: dependency; ImageMagick>`  |image39| |image40| |Auto-download|
 

kibot/dep_downloader.py

@@ -40,6 +40,7 @@
     arch: librsvg
     command: rsvg-convert
     downloader: rsvg
+    version: 2.40.3
     id: RSVG
     tests:
       - command: [convert, -list, font]

kibot/out_any_navigate_results.py

@@ -204,7 +204,7 @@ def add_to_tree(self, cat, out, o_tree):
             node[out.name] = out
 
     def svg_to_png(self, svg_file, png_file, width):
-        cmd = [self.rsvg_command, '-w', str(width), '-f', 'png', '-o', png_file, svg_file]
+        cmd = [self.rsvg_command, '-w', str(width), '-f', 'png', '--unlimited', '-o', png_file, svg_file]
         return _run_command(cmd)
 
     def copy(self, img, width):

kibot/out_pcb_print.py

@@ -1299,8 +1299,8 @@ def svg_to_pdf(self, input_folder, svg_file, pdf_file):
         # We use a 5x scale and then reduce it to maintain the page size
         # Note: rsvg 2.50.3 has this problem 2.54.5 doesn't, so we ensure the size is correct, not a fixed scale
         dpi = str(self.dpi)
-        cmd = [self.rsvg_command, '-d', dpi, '-p', dpi, '-f', 'pdf', '-o', os.path.join(input_folder, pdf_file),
-               os.path.join(input_folder, svg_file)]
+        cmd = [self.rsvg_command, '-d', dpi, '-p', dpi, '-f', 'pdf', '--unlimited', '-o',
+               os.path.join(input_folder, pdf_file), os.path.join(input_folder, svg_file)]
         _run_command(cmd)
 
     # We can't control the resolution in this way

kibot/out_pcbdraw.py

@@ -486,7 +486,7 @@ def create_image(self, name, board):
         if self.rsvg_command:
             logger.debug('Converting {} -> {}'.format(svg_save_output_name, save_output_name))
             cmd = [self.rsvg_command, '--dpi-x', str(self.dpi), '--dpi-y', str(self.dpi),
-                   '--output', save_output_name, '--format', 'png', svg_save_output_name]
+                   '--output', save_output_name, '--format', 'png', '--unlimited', svg_save_output_name]
             _run_command(cmd)
             os.remove(svg_save_output_name)
         # Do we need to convert the saved file? (JPG/BMP)

src/kibot-check

@@ -1211,55 +1211,83 @@ deps = '{\
                 "mandatory": false,\
                 "max_version": null,\
                 "output": "bom",\
-                "version": null\
+                "version": [\
+                    2,\
+                    40,\
+                    3\
+                ]\
             },\
             {\
                 "all_versions": {},\
                 "desc": "Create outputs preview",\
                 "mandatory": false,\
                 "max_version": null,\
                 "output": "navigate_results",\
-                "version": null\
+                "version": [\
+                    2,\
+                    40,\
+                    3\
+                ]\
             },\
             {\
                 "all_versions": {},\
                 "desc": "Create PNG icons",\
                 "mandatory": false,\
                 "max_version": null,\
                 "output": "navigate_results",\
-                "version": null\
+                "version": [\
+                    2,\
+                    40,\
+                    3\
+                ]\
             },\
             {\
                 "all_versions": {},\
                 "desc": "Create outputs preview",\
                 "mandatory": false,\
                 "max_version": null,\
                 "output": "navigate_results_rb",\
-                "version": null\
+                "version": [\
+                    2,\
+                    40,\
+                    3\
+                ]\
             },\
             {\
                 "all_versions": {},\
                 "desc": "Create PNG icons",\
                 "mandatory": false,\
                 "max_version": null,\
                 "output": "navigate_results_rb",\
-                "version": null\
+                "version": [\
+                    2,\
+                    40,\
+                    3\
+                ]\
             },\
             {\
                 "all_versions": {},\
                 "desc": "Create PDF, PNG, PS and EPS formats",\
                 "mandatory": false,\
                 "max_version": null,\
                 "output": "pcb_print",\
-                "version": null\
+                "version": [\
+                    2,\
+                    40,\
+                    3\
+                ]\
             },\
             {\
                 "all_versions": {},\
                 "desc": "Create PNG, JPG and BMP images",\
                 "mandatory": false,\
                 "max_version": null,\
                 "output": "pcbdraw",\
-                "version": null\
+                "version": [\
+                    2,\
+                    40,\
+                    3\
+                ]\
             }\
         ],\
         "tests": [\

tests/utils/context.py

@@ -573,15 +573,15 @@ def compare_image(self, image, reference=None, diff='diff.png', ref_out_dir=Fals
         png_ref = None
         if reference[-3:] == 'svg':
             png_ref = reference[:-3]+'png'
-            cmd = ['rsvg-convert', '-b', '#FFFFFF', '-h', '2160', '-o', png_ref, reference]
+            cmd = ['rsvg-convert', '-b', '#FFFFFF', '-h', '2160', '--unlimited', '-o', png_ref, reference]
             logging.debug('Converting reference to PNG with: '+usable_cmd(cmd))
             subprocess.check_call(cmd)
             reference = png_ref
             assert os.path.isfile(png_ref)
         png_image = None
         if image[-3:] == 'svg':
             png_image = image[:-3]+'png'
-            cmd = ['rsvg-convert', '-b', '#FFFFFF', '-h', '2160', '-o', png_image, image]
+            cmd = ['rsvg-convert', '-b', '#FFFFFF', '-h', '2160', '--unlimited', '-o', png_image, image]
             logging.debug('Converting result image to PNG with: '+usable_cmd(cmd))
             subprocess.check_call(cmd)
             image = png_image