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

Pacify librsvg 2.45.1 and later

Browse source 
* src/image.c (svg_load_image): Pacify librsvg 2.45.1 and later,
and add a FIXME comment about the deprecated librsvg functions.
Backport from master.
This commit is contained in:
Paul Eggert 2019-05-30 15:06:39 -07:00
parent d93f4bda7a
commit 7871c3dc9f
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/image.c
View file

@ -9306,6 +9306,17 @@ svg_load_image (struct frame *f, struct image *img, char *contents,
if (filename)
rsvg_handle_set_base_uri(rsvg_handle, filename);
/* Suppress GCC deprecation warnings starting in librsvg 2.45.1 for
rsvg_handle_write and rsvg_handle_close. FIXME: Use functions
like rsvg_handle_new_from_gfile_sync on newer librsvg versions,
and remove this hack. */
#if GNUC_PREREQ (4, 6, 0)
#pragma GCC diagnostic push
#endif
#if LIBRSVG_CHECK_VERSION (2, 45, 1) && GNUC_PREREQ (4, 2, 0)
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
/* Parse the contents argument and fill in the rsvg_handle. */
rsvg_handle_write (rsvg_handle, (unsigned char *) contents, size, &err);
if (err) goto rsvg_error;
@ -9315,6 +9326,10 @@ svg_load_image (struct frame *f, struct image *img, char *contents,
rsvg_handle_close (rsvg_handle, &err);
if (err) goto rsvg_error;
#if GNUC_PREREQ (4, 6, 0)
#pragma GCC diagnostic pop
#endif
rsvg_handle_get_dimensions (rsvg_handle, &dimension_data);
if (! check_image_size (f, dimension_data.width, dimension_data.height))
{