* src/image.c (imagemagick_load_image): Fix type mismatch.

(Fimagemagick_types): Likewise.

diff --git a/src/ChangeLog b/src/ChangeLog
index 92130c350507b231cac7aefd855f1a5103065d32..4692677834544e4ea151433c6b591c4bed5d7b41 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-06-11  Andreas Schwab  <schwab@linux-m68k.org>
 
+       * image.c (imagemagick_load_image): Fix type mismatch.
+       (Fimagemagick_types): Likewise.
+
        * window.h (replace_buffer_in_windows): Declare.
 
 2011-06-11  Martin Rudalics  <rudalics@gmx.at>

diff --git a/src/image.c b/src/image.c
index b755d7414437ae3d3bc32e7d77757ca0ead185c9..b381e990dab8f148cb16e50931af8eeaa2c15448 100644 (file)
--- 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;