# HG changeset patch # User Andreas Schwab # Date 1283596912 -7200 # Node ID 6488e31d7e9409f36ec37061f2641ce1e82d94b7 # Parent 873c8f137ae341d45f82bdd435562acf3bddc9aa Fix type mismatch in ImageMagick loader * image.c (imagemagick_load_image): Fix type mismatch. (Fimagemagick_types): Likewise. diff -r 873c8f137ae3 -r 6488e31d7e94 src/ChangeLog --- a/src/ChangeLog Sat Sep 04 10:23:09 2010 +0200 +++ b/src/ChangeLog Sat Sep 04 12:41:52 2010 +0200 @@ -1,6 +1,8 @@ 2010-09-04 Andreas Schwab * image.c (imagemagick_image_p): Replace bcopy by memcpy. + (imagemagick_load_image): Fix type mismatch. + (Fimagemagick_types): Likewise. 2010-09-02 Jan Djärv diff -r 873c8f137ae3 -r 6488e31d7e94 src/image.c --- a/src/image.c Sat Sep 04 10:23:09 2010 +0200 +++ b/src/image.c Sat Sep 04 12:41:52 2010 +0200 @@ -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;