[Emacs-diffs] /srv/bzr/emacs/trunk r104561: * src/image.c (imagemagick_load_image): Fix type mismatch.

[Andreas Schwab]

------------------------------------------------------------
revno: 104561
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sat 2011-06-11 12:11:07 +0200
message:
  * src/image.c (imagemagick_load_image): Fix type mismatch.
  (Fimagemagick_types): Likewise.
modified:
  src/ChangeLog
  src/image.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-06-11 10:11:07 +0000
+++ b/src/ChangeLog     2011-06-11 10:11:07 +0000
@@ -1,5 +1,8 @@
 2011-06-11  Andreas Schwab  <address@hidden>
 
+       * image.c (imagemagick_load_image): Fix type mismatch.
+       (Fimagemagick_types): Likewise.
+
        * window.h (replace_buffer_in_windows): Declare.
 
 2011-06-11  Martin Rudalics  <address@hidden>

=== modified file 'src/image.c'
--- a/src/image.c       2011-06-11 01:48:59 +0000
+++ b/src/image.c       2011-06-11 10:11:07 +0000
@@ -7480,8 +7480,8 @@
                        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 @@
   (void)
 {
   Lisp_Object typelist = Qnil;
-  unsigned long numf = 0;
+  size_t numf = 0;
   ExceptionInfo ex;
   char **imtypes = GetMagickList ("*", &numf, &ex);
   int i;