Mercurial > emacs
comparison src/image.c @ 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 |
comparison
equal
deleted
inserted
replaced
| 110174:873c8f137ae3 | 110175:6488e31d7e94 |
|---|---|
| 7448 unsigned int size, | 7448 unsigned int size, |
| 7449 /* Filename, either pass filename or | 7449 /* Filename, either pass filename or |
| 7450 contents/size. */ | 7450 contents/size. */ |
| 7451 unsigned char *filename) | 7451 unsigned char *filename) |
| 7452 { | 7452 { |
| 7453 size_t width; | 7453 unsigned long width; |
| 7454 size_t height; | 7454 unsigned long height; |
| 7455 | 7455 |
| 7456 MagickBooleanType | 7456 MagickBooleanType |
| 7457 status; | 7457 status; |
| 7458 | 7458 |
| 7459 XImagePtr ximg; | 7459 XImagePtr ximg; |
| 7828 Since ImageMagick recognizes a lot of file-types that clash with Emacs, | 7828 Since ImageMagick recognizes a lot of file-types that clash with Emacs, |
| 7829 such as .c, we want to be able to alter the list at the lisp level. */) | 7829 such as .c, we want to be able to alter the list at the lisp level. */) |
| 7830 (void) | 7830 (void) |
| 7831 { | 7831 { |
| 7832 Lisp_Object typelist = Qnil; | 7832 Lisp_Object typelist = Qnil; |
| 7833 size_t numf; | 7833 unsigned long numf; |
| 7834 ExceptionInfo ex; | 7834 ExceptionInfo ex; |
| 7835 char** imtypes = GetMagickList ("*", &numf, &ex); | 7835 char** imtypes = GetMagickList ("*", &numf, &ex); |
| 7836 int i; | 7836 int i; |
| 7837 Lisp_Object Qimagemagicktype; | 7837 Lisp_Object Qimagemagicktype; |
| 7838 for (i = 0; i < numf; i++) | 7838 for (i = 0; i < numf; i++) |