[Emacs-diffs] /srv/bzr/emacs/trunk r101326: Fix type mismatch in ImageMagick loader

[Andreas Schwab]

------------------------------------------------------------
revno: 101326
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sat 2010-09-04 12:41:52 +0200
message:
  Fix type mismatch in ImageMagick loader
  
  * image.c (imagemagick_load_image): Fix type mismatch.
  (Fimagemagick_types): Likewise.
modified:
  src/ChangeLog
  src/image.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-09-04 08:23:09 +0000
+++ b/src/ChangeLog     2010-09-04 10:41:52 +0000
@@ -1,6 +1,8 @@
 2010-09-04  Andreas Schwab  <address@hidden>
 
        * image.c (imagemagick_image_p): Replace bcopy by memcpy.
+       (imagemagick_load_image): Fix type mismatch.
+       (Fimagemagick_types): Likewise.
 
 2010-09-02  Jan Djärv  <address@hidden>
 

=== modified file 'src/image.c'
--- a/src/image.c       2010-09-04 08:23:09 +0000
+++ b/src/image.c       2010-09-04 10:41:52 +0000
@@ -7450,8 +7450,8 @@
                            contents/size.  */
                         unsigned char *filename)
 {
-  size_t width;
-  size_t height;
+  unsigned long width;
+  unsigned long height;
 
   MagickBooleanType
     status;
@@ -7830,7 +7830,7 @@
   (void)
 {
   Lisp_Object typelist = Qnil;
-  size_t numf;
+  unsigned long numf;
   ExceptionInfo ex;
   char** imtypes = GetMagickList ("*", &numf, &ex);
   int i;