Fix type mismatch in ImageMagick loader

* image.c (imagemagick_load_image): Fix type mismatch.
(Fimagemagick_types): Likewise.

diff --git a/src/ChangeLog b/src/ChangeLog
index ce5e139f49cd75d8b9dac3cdc99c48e8772e5bca..d1d03ba6411d39dce8aec99191bc0f713371d87e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,8 @@
 2010-09-04  Andreas Schwab  <schwab@linux-m68k.org>
 
        * image.c (imagemagick_image_p): Replace bcopy by memcpy.
+       (imagemagick_load_image): Fix type mismatch.
+       (Fimagemagick_types): Likewise.
 
 2010-09-02  Jan Djärv  <jan.h.d@swipnet.se>
 

diff --git a/src/image.c b/src/image.c
index e6e1605b024861c725251bbc314dfcf3ca521ea0..3eec0cbc802053c8becf5cf182f80f301646351c 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -7450,8 +7450,8 @@ imagemagick_load_image (/* Pointer to emacs frame structure.  */
                            contents/size.  */
                         unsigned char *filename)
 {
-  size_t width;
-  size_t height;
+  unsigned long width;
+  unsigned long height;
 
   MagickBooleanType
     status;
@@ -7830,7 +7830,7 @@ DEFUN ("imagemagick-types", Fimagemagick_types, Simagemagick_types, 0, 0, 0,
   (void)
 {
   Lisp_Object typelist = Qnil;
-  size_t numf;
+  unsigned long numf;
   ExceptionInfo ex;
   char** imtypes = GetMagickList ("*", &numf, &ex);
   int i;