[mapserver-commits] [MapServer/MapServer] 842039: mapcairo.c: revert to svg_handle_render_cairo() (f...

[Jeff McKenna]

  Branch: refs/heads/backport-7583-to-branch-8-6
  Home:   https://github.com/MapServer/MapServer
  Commit: 842039a05077a7dd8786051f051142f0b1fdd192
      https://github.com/MapServer/MapServer/commit/842039a05077a7dd8786051f051142f0b1fdd192
  Author: Johannes Eberenz <johannes.eberenz at alliander.com>
  Date:   2026-08-11 (Tue, 11 Aug 2026)

  Changed paths:
    M src/mapcairo.c

  Log Message:
  -----------
  mapcairo.c: revert to svg_handle_render_cairo() (fixes: #7430)

Since 8.6, rsvg_handle_render_cairo() (marked as depriceated) was replaced with the newer rsvg_handle_render_document(), however this caused scaling issues (#7430). This PR implements a simple workaround by reverting back to the legacy function, solving the issues.


  Commit: 58e503d351c5012ac626284abc98f71d911f1906
      https://github.com/MapServer/MapServer/commit/58e503d351c5012ac626284abc98f71d911f1906
  Author: Johannes Eberenz <johannes.eberenz at alliander.com>
  Date:   2026-08-11 (Tue, 11 Aug 2026)

  Changed paths:
    M src/mapcairo.c

  Log Message:
  -----------
  fix svg scaling by using rsvg_handle_render_document without cairo_scale


  Commit: 84cafdc9fb3afa3552814031ec722e0f93b055cf
      https://github.com/MapServer/MapServer/commit/84cafdc9fb3afa3552814031ec722e0f93b055cf
  Author: Johannes Eberenz <johannes.eberenz at alliander.com>
  Date:   2026-08-11 (Tue, 11 Aug 2026)

  Changed paths:
    M msautotest/sld/expected/map_linemark.png

  Log Message:
  -----------
  correctly rendered test result


  Commit: 91f552a6be64a0c81aa950e7d329117168db3066
      https://github.com/MapServer/MapServer/commit/91f552a6be64a0c81aa950e7d329117168db3066
  Author: Johannes Eberenz <johannes.eberenz at alliander.com>
  Date:   2026-08-11 (Tue, 11 Aug 2026)

  Changed paths:
    A msautotest/wxs/expected/point_symbol_identification_anchor copy.png
    M msautotest/wxs/point_symbol_identification.map

  Log Message:
  -----------
  update test coordinates for correctly rendeted SVG


  Commit: 71943461c4bbc7b4b0c7256eb522ffa0bb718a0b
      https://github.com/MapServer/MapServer/commit/71943461c4bbc7b4b0c7256eb522ffa0bb718a0b
  Author: Johannes Eberenz <johannes.eberenz at alliander.com>
  Date:   2026-08-11 (Tue, 11 Aug 2026)

  Changed paths:
    R msautotest/wxs/expected/point_symbol_identification_anchor copy.png
    M msautotest/wxs/expected/point_symbol_identification_anchor.png
    M src/mapcairo.c

  Log Message:
  -----------
  use symbol size for rsvg_handle_render_document and check vor librscg version

This allows cairo and older rsvgr rendering with scale_cairo>
Also fixed incorrect test png file name


  Commit: d1309757bd92ca17fb784bfe715e58251ec5dfaf
      https://github.com/MapServer/MapServer/commit/d1309757bd92ca17fb784bfe715e58251ec5dfaf
  Author: Jeff McKenna <jmckenna at gatewaygeomatics.com>
  Date:   2026-08-11 (Tue, 11 Aug 2026)

  Changed paths:
    M msautotest/renderers/expected/line_marker_svg.png
    M msautotest/renderers/expected/point_svg.png
    M msautotest/sld/expected/map_linemark.png
    M msautotest/sld/expected/sld_linemark.png
    M msautotest/sld/expected/sld_url_linemark.png
    M msautotest/wxs/expected/wms_get_map_symbol_ext_svg_sld.png

  Log Message:
  -----------
  update expected results


Compare: https://github.com/MapServer/MapServer/compare/842039a05077%5E...d1309757bd92

To unsubscribe from these emails, change your notification settings at https://github.com/MapServer/MapServer/settings/notifications