procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the version of librsvg API change

Browse source 
* src/image.c (init_svg_functions, svg_load_image): The first
official version that introduces
'rsvg_handle_get_pixbuf_and_error' is 2.59.0 not 2.58.0.
(Bug#74606)
This commit is contained in:
Manuel Giraud 2024-12-02 15:11:52 +01:00 • committed by Eli Zaretskii
parent 43c4a06ffc
commit f65de1019d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/image.c
View file

@ -11655,7 +11655,7 @@ DEF_DLL_FN (void, rsvg_handle_get_dimensions,
DEF_DLL_FN (gboolean, rsvg_handle_set_stylesheet,
(RsvgHandle *, const guint8 *, gsize, GError **));
# endif
# if LIBRSVG_CHECK_VERSION (2, 58, 0)
# if LIBRSVG_CHECK_VERSION (2, 59, 0)
DEF_DLL_FN (GdkPixbuf *, rsvg_handle_get_pixbuf_and_error, (RsvgHandle *, GError **));
# else
DEF_DLL_FN (GdkPixbuf *, rsvg_handle_get_pixbuf, (RsvgHandle *));
@ -11718,7 +11718,7 @@ init_svg_functions (void)
#if LIBRSVG_CHECK_VERSION (2, 48, 0)
LOAD_DLL_FN (library, rsvg_handle_set_stylesheet);
#endif
#if LIBRSVG_CHECK_VERSION (2, 58, 0)
#if LIBRSVG_CHECK_VERSION (2, 59, 0)
LOAD_DLL_FN (library, rsvg_handle_get_pixbuf_and_error);
#else
LOAD_DLL_FN (library, rsvg_handle_get_pixbuf);
@ -11767,7 +11767,7 @@ init_svg_functions (void)
# if LIBRSVG_CHECK_VERSION (2, 48, 0)
# undef rsvg_handle_set_stylesheet
# endif
# if LIBRSVG_CHECK_VERSION (2, 58, 0)
# if LIBRSVG_CHECK_VERSION (2, 59, 0)
# undef rsvg_handle_get_pixbuf_and_error
# else
# undef rsvg_handle_get_pixbuf
@ -11812,7 +11812,7 @@ init_svg_functions (void)
# if LIBRSVG_CHECK_VERSION (2, 48, 0)
# define rsvg_handle_set_stylesheet fn_rsvg_handle_set_stylesheet
# endif
# if LIBRSVG_CHECK_VERSION (2, 58, 0)
# if LIBRSVG_CHECK_VERSION (2, 59, 0)
# define rsvg_handle_get_pixbuf_and_error fn_rsvg_handle_get_pixbuf_and_error
# else
# define rsvg_handle_get_pixbuf fn_rsvg_handle_get_pixbuf
@ -12321,7 +12321,7 @@ svg_load_image (struct frame *f, struct image *img, char *contents,
/* We can now get a valid pixel buffer from the svg file, if all
went ok. */
#if LIBRSVG_CHECK_VERSION (2, 58, 0)
#if LIBRSVG_CHECK_VERSION (2, 59, 0)
pixbuf = rsvg_handle_get_pixbuf_and_error (rsvg_handle, &err);
if (err) goto rsvg_error;
#else