Mercurial > emacs
changeset 110175:6488e31d7e94
Fix type mismatch in ImageMagick loader
* image.c (imagemagick_load_image): Fix type mismatch.
(Fimagemagick_types): Likewise.
| author | Andreas Schwab <schwab@linux-m68k.org> |
|---|---|
| date | Sat, 04 Sep 2010 12:41:52 +0200 |
| parents | 873c8f137ae3 |
| children | e04dbb6aa46a |
| files | src/ChangeLog src/image.c |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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 <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>
--- 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;