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: fix color mixup in "file-svg-load".

Browse source
This commit is contained in:
Jehan 2024-03-10 01:01:16 +01:00
parent 4e3792d3f1
commit de7d0b3663
1 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -111,6 +111,9 @@ static GimpPDBStatusType load_dialog (GFile *file,
RsvgHandleFlags *rsvg_flags,
GError **error);
static void svg_destroy_surface (guchar *pixels,
cairo_surface_t *surface);
G_DEFINE_TYPE (Svg, svg, GIMP_TYPE_PLUG_IN)
@ -482,8 +485,8 @@ load_rsvg_pixbuf (GFile *file,
RsvgHandle *handle;
#if LIBRSVG_CHECK_VERSION(2, 46, 0)
cairo_surface_t *surf = NULL;
cairo_t *cr = NULL;
cairo_surface_t *surface = NULL;
cairo_t *cr = NULL;
RsvgRectangle viewport = { 0, };
guchar *src;
gint y;
@ -505,21 +508,18 @@ load_rsvg_pixbuf (GFile *file,
rsvg_handle_set_dpi (handle, resolution);
#if LIBRSVG_CHECK_VERSION(2, 46, 0)
pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, width, height);
surf = cairo_image_surface_create_for_data (gdk_pixbuf_get_pixels (pixbuf),
CAIRO_FORMAT_ARGB32,
gdk_pixbuf_get_width (pixbuf),
gdk_pixbuf_get_height (pixbuf),
gdk_pixbuf_get_rowstride (pixbuf));
cr = cairo_create (surf);
surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height);
cr = cairo_create (surface);
viewport.width = width;
viewport.width = width;
viewport.height = height;
rsvg_handle_render_document (handle, cr, &viewport, NULL);
pixbuf = gdk_pixbuf_new_from_data (cairo_image_surface_get_data (surface),
GDK_COLORSPACE_RGB, TRUE, 8, width, height,
cairo_format_stride_for_width (CAIRO_FORMAT_ARGB32, width),
(GdkPixbufDestroyNotify) svg_destroy_surface, surface);
cairo_destroy (cr);
cairo_surface_destroy (surf);
/* un-premultiply the data */
src = gdk_pixbuf_get_pixels (pixbuf);
@ -527,7 +527,7 @@ load_rsvg_pixbuf (GFile *file,
for (y = 0; y < height; y++)
{
guchar *s = src;
gint w = width;
gint w = width;
while (w--)
{
@ -863,3 +863,10 @@ load_dialog (GFile *file,
return run ? GIMP_PDB_SUCCESS : GIMP_PDB_CANCEL;
}
static void
svg_destroy_surface (guchar *pixels,
cairo_surface_t *surface)
{
cairo_surface_destroy (surface);
}