eUgEntOptIc44/gimp
1
1
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-10-06 05:22:40 +02:00
Code Issues Releases Activity

plug-ins: fix compilation with librsvg < 2.46.0.

Browse Source 
Note that it's not actually tested with an old librsvg, but only forcing
this code path with a new librsvg and fixing the compilation
errors/warnings which are outputted.
This commit is contained in:
Jehan
2025-08-28 11:40:12 +02:00
parent 640fb89f13
commit d8712a525b
1 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
plug-ins/common/file-svg.c
View File

@@ -74,7 +74,6 @@ static GList * svg_query_procedures (GimpPlugIn *plug_in);
static GimpProcedure * svg_create_procedure (GimpPlugIn *plug_in, static GimpProcedure * svg_create_procedure (GimpPlugIn *plug_in,
const gchar *name); const gchar *name);
static GimpUnit * svg_rsvg_to_gimp_unit (RsvgUnit unit);
static gboolean svg_extract (GimpProcedure *procedure, static gboolean svg_extract (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GFile *file, GFile *file,
@@ -115,8 +114,11 @@ static GimpPDBStatusType load_dialog (GFile *file,
GimpVectorLoadData extracted_data, GimpVectorLoadData extracted_data,
GError **error); GError **error);
#if LIBRSVG_CHECK_VERSION(2, 46, 0)
static GimpUnit * svg_rsvg_to_gimp_unit (RsvgUnit unit);
static void svg_destroy_surface (guchar *pixels, static void svg_destroy_surface (guchar *pixels,
cairo_surface_t *surface); cairo_surface_t *surface);
#endif
@@ -198,32 +200,6 @@ svg_create_procedure (GimpPlugIn *plug_in,
return procedure; return procedure;
} }
static GimpUnit *
svg_rsvg_to_gimp_unit (RsvgUnit unit)
{
switch (unit)
{
case RSVG_UNIT_PERCENT:
return gimp_unit_percent ();
case RSVG_UNIT_PX:
return gimp_unit_pixel ();
case RSVG_UNIT_IN:
return gimp_unit_inch ();
case RSVG_UNIT_MM:
return gimp_unit_mm ();
case RSVG_UNIT_PT:
return gimp_unit_point ();
case RSVG_UNIT_PC:
return gimp_unit_pica ();
case RSVG_UNIT_CM:
case RSVG_UNIT_EM:
case RSVG_UNIT_EX:
/*case RSVG_UNIT_CH:*/
default:
return NULL;
}
}
static gboolean static gboolean
svg_extract (GimpProcedure *procedure, svg_extract (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
@@ -707,7 +683,7 @@ load_rsvg_pixbuf (RsvgHandle *handle,
vals.resolution = resolution; vals.resolution = resolution;
vals.width = width; vals.width = width;
vals.height = height; vals.height = height;
rsvg_handle_set_size_callback (handle, load_set_size_callback, vals, NULL); rsvg_handle_set_size_callback (handle, load_set_size_callback, (gpointer) &vals, NULL);
pixbuf = rsvg_handle_get_pixbuf (handle); pixbuf = rsvg_handle_get_pixbuf (handle);
#endif #endif
@@ -816,9 +792,37 @@ load_dialog (GFile *file,
return run ? GIMP_PDB_SUCCESS : GIMP_PDB_CANCEL; return run ? GIMP_PDB_SUCCESS : GIMP_PDB_CANCEL;
} }
#if LIBRSVG_CHECK_VERSION(2, 46, 0)
static GimpUnit *
svg_rsvg_to_gimp_unit (RsvgUnit unit)
{
switch (unit)
{
case RSVG_UNIT_PERCENT:
return gimp_unit_percent ();
case RSVG_UNIT_PX:
return gimp_unit_pixel ();
case RSVG_UNIT_IN:
return gimp_unit_inch ();
case RSVG_UNIT_MM:
return gimp_unit_mm ();
case RSVG_UNIT_PT:
return gimp_unit_point ();
case RSVG_UNIT_PC:
return gimp_unit_pica ();
case RSVG_UNIT_CM:
case RSVG_UNIT_EM:
case RSVG_UNIT_EX:
/*case RSVG_UNIT_CH:*/
default:
return NULL;
}
}
static void static void
svg_destroy_surface (guchar *pixels, svg_destroy_surface (guchar *pixels,
cairo_surface_t *surface) cairo_surface_t *surface)
{ {
cairo_surface_destroy (surface); cairo_surface_destroy (surface);
} }
#endif