From 40693bbaa3889dd517f6017bedfceb4a0c12d7a7 Mon Sep 17 00:00:00 2001 From: rzl24ozi Date: Wed, 27 Mar 2013 15:26:34 +0200 Subject: [PATCH] image.c [WINDOWSNT]: Fix calls to DEF_IMGLIB_FN for SVG function. --- src/ChangeLog | 4 ++++ src/image.c | 36 ++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c4b92bf9c17..7b25fb54441 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-03-27 rzl24ozi (tiny changes) + + * image.c [WINDOWSNT]: Fix calls to DEF_IMGLIB_FN for SVG function. + 2013-03-27 Eli Zaretskii * w32proc.c (IsValidLocale) [__GNUC__]: Don't declare prototype, diff --git a/src/image.c b/src/image.c index 21f486176df..6da430bee73 100644 --- a/src/image.c +++ b/src/image.c @@ -8120,24 +8120,24 @@ svg_image_p (Lisp_Object object) #ifdef WINDOWSNT /* SVG library functions. */ -DEF_IMGLIB_FN (RsvgHandle *, rsvg_handle_new); -DEF_IMGLIB_FN (void, rsvg_handle_get_dimensions); -DEF_IMGLIB_FN (gboolean, rsvg_handle_write); -DEF_IMGLIB_FN (gboolean, rsvg_handle_close); -DEF_IMGLIB_FN (GdkPixbuf *, rsvg_handle_get_pixbuf); - -DEF_IMGLIB_FN (int, gdk_pixbuf_get_width); -DEF_IMGLIB_FN (int, gdk_pixbuf_get_height); -DEF_IMGLIB_FN (guchar *, gdk_pixbuf_get_pixels); -DEF_IMGLIB_FN (int, gdk_pixbuf_get_rowstride); -DEF_IMGLIB_FN (GdkColorspace, gdk_pixbuf_get_colorspace); -DEF_IMGLIB_FN (int, gdk_pixbuf_get_n_channels); -DEF_IMGLIB_FN (gboolean, gdk_pixbuf_get_has_alpha); -DEF_IMGLIB_FN (int, gdk_pixbuf_get_bits_per_sample); - -DEF_IMGLIB_FN (void, g_type_init); -DEF_IMGLIB_FN (void, g_object_unref); -DEF_IMGLIB_FN (void, g_error_free); +DEF_IMGLIB_FN (RsvgHandle *, rsvg_handle_new, (void)); +DEF_IMGLIB_FN (void, rsvg_handle_get_dimensions, (RsvgHandle *, RsvgDimensionData *)); +DEF_IMGLIB_FN (gboolean, rsvg_handle_write, (RsvgHandle *, const guchar *, gsize, GError **)); +DEF_IMGLIB_FN (gboolean, rsvg_handle_close, (RsvgHandle *, GError **)); +DEF_IMGLIB_FN (GdkPixbuf *, rsvg_handle_get_pixbuf, (RsvgHandle *)); +DEF_IMGLIB_FN (void *, rsvg_handle_set_size_callback, (RsvgHandle *, RsvgSizeFunc, gpointer, GDestroyNotify)); + +DEF_IMGLIB_FN (int, gdk_pixbuf_get_width, (const GdkPixbuf *)); +DEF_IMGLIB_FN (int, gdk_pixbuf_get_height, (const GdkPixbuf *)); +DEF_IMGLIB_FN (guchar *, gdk_pixbuf_get_pixels, (const GdkPixbuf *)); +DEF_IMGLIB_FN (int, gdk_pixbuf_get_rowstride, (const GdkPixbuf *)); +DEF_IMGLIB_FN (GdkColorspace, gdk_pixbuf_get_colorspace, (const GdkPixbuf *)); +DEF_IMGLIB_FN (int, gdk_pixbuf_get_n_channels, (const GdkPixbuf *)); +DEF_IMGLIB_FN (gboolean, gdk_pixbuf_get_has_alpha, (const GdkPixbuf *)); +DEF_IMGLIB_FN (int, gdk_pixbuf_get_bits_per_sample, (const GdkPixbuf *)); + +DEF_IMGLIB_FN (void, g_type_init, (void)); +DEF_IMGLIB_FN (void, g_object_unref, (gpointer)); Lisp_Object Qgdk_pixbuf, Qglib, Qgobject; -- 2.39.2