procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-03 17:33:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

plug-ins: Use viewbox dims if needed for SVG

Browse source 
Starting in librsvg 2.54,
rsvg_handle_get_intrinsic_dimensions ()
always returns TRUE for width and height because
the SVG assumes a width/height of 100%.
This means that SVGs without explicit widths/heights
are loaded as 1px by 1px.
This patch adds a check to see if the width/height is
100%, and if the viewbox exists, we use those values
instead.
This commit is contained in:
Alx Sa 2025-04-04 02:09:02 +00:00
parent d66e58265d
commit 4dfa4924ff
1 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

31
plug-ins/common/file-svg.c
View file

@ -353,9 +353,19 @@ svg_extract (GimpProcedure *procedure,
if (out_has_width && out_has_height) if (out_has_width && out_has_height)
{ {
/* "width" and "height" present: the viewbox has no importance (it's only /* Starting in librsvg 2.54, rsvg_handle_get_intrinsic_dimensions ()
* a coordinate remapping. * always returns TRUE for width/height. If width/height default to 100%,
*/ * we should check the viewport dimensions */
gdouble viewbox_width = 0;
gdouble viewbox_height = 0;
if (out_has_viewbox)
{
viewbox_width = out_viewbox.width - out_viewbox.x;
viewbox_height = out_viewbox.height - out_viewbox.y;
}
/* "width" and "height" present */
if (svg_rsvg_to_gimp_unit (out_width.unit) != NULL && if (svg_rsvg_to_gimp_unit (out_width.unit) != NULL &&
svg_rsvg_to_gimp_unit (out_height.unit) != NULL) svg_rsvg_to_gimp_unit (out_height.unit) != NULL)
{ {
@ -365,8 +375,19 @@ svg_extract (GimpProcedure *procedure,
extracted_dimensions->height = out_height.length; extracted_dimensions->height = out_height.length;
extracted_dimensions->height_unit = svg_rsvg_to_gimp_unit (out_height.unit); extracted_dimensions->height_unit = svg_rsvg_to_gimp_unit (out_height.unit);
extracted_dimensions->exact_width = TRUE; if ((out_width.length == 1.0 && out_width.unit == RSVG_UNIT_PERCENT) &&
extracted_dimensions->exact_height = TRUE; (out_height.length == 1.0 && out_height.unit == RSVG_UNIT_PERCENT))
{
extracted_dimensions->width = viewbox_width;
extracted_dimensions->height = viewbox_height;
extracted_dimensions->exact_width = FALSE;
extracted_dimensions->exact_height = FALSE;
}
else
{
extracted_dimensions->exact_width = TRUE;
extracted_dimensions->exact_height = TRUE;
}
} }
else else
{ {