From 1ab0dee5ca2b1368770aac0f796959c95f18ed89 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sat, 11 Jun 2011 12:11:07 +0200 Subject: [PATCH] * src/image.c (imagemagick_load_image): Fix type mismatch. (Fimagemagick_types): Likewise. --- src/ChangeLog | 3 +++ src/image.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 92130c35050..46926778345 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2011-06-11 Andreas Schwab + * image.c (imagemagick_load_image): Fix type mismatch. + (Fimagemagick_types): Likewise. + * window.h (replace_buffer_in_windows): Declare. 2011-06-11 Martin Rudalics diff --git a/src/image.c b/src/image.c index b755d741443..b381e990dab 100644 --- a/src/image.c +++ b/src/image.c @@ -7480,8 +7480,8 @@ imagemagick_load_image (struct frame *f, struct image *img, unsigned char *contents, unsigned int size, char *filename) { - unsigned long width; - unsigned long height; + size_t width; + size_t height; MagickBooleanType status; @@ -7858,7 +7858,7 @@ recognize as images, such as C. See `imagemagick-types-inhibit'. */) (void) { Lisp_Object typelist = Qnil; - unsigned long numf = 0; + size_t numf = 0; ExceptionInfo ex; char **imtypes = GetMagickList ("*", &numf, &ex); int i; -- 2.39.2