diff options
| author | Andreas Schwab | 2010-09-04 12:41:52 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2010-09-04 12:41:52 +0200 |
| commit | b7d187f836b71bfead1f99110842def6e9fcb596 (patch) | |
| tree | f058f61e9b22a7b35000ba348c2ab12dcca43198 /src | |
| parent | dbfe4532cba587de47d8c20348a2c01d7b801dad (diff) | |
| download | emacs-b7d187f836b71bfead1f99110842def6e9fcb596.tar.gz emacs-b7d187f836b71bfead1f99110842def6e9fcb596.zip | |
Fix type mismatch in ImageMagick loader
* image.c (imagemagick_load_image): Fix type mismatch.
(Fimagemagick_types): Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/image.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ce5e139f49c..d1d03ba6411 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | 2010-09-04 Andreas Schwab <schwab@linux-m68k.org> | 1 | 2010-09-04 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 2 | ||
| 3 | * image.c (imagemagick_image_p): Replace bcopy by memcpy. | 3 | * image.c (imagemagick_image_p): Replace bcopy by memcpy. |
| 4 | (imagemagick_load_image): Fix type mismatch. | ||
| 5 | (Fimagemagick_types): Likewise. | ||
| 4 | 6 | ||
| 5 | 2010-09-02 Jan Djärv <jan.h.d@swipnet.se> | 7 | 2010-09-02 Jan Djärv <jan.h.d@swipnet.se> |
| 6 | 8 | ||
diff --git a/src/image.c b/src/image.c index e6e1605b024..3eec0cbc802 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -7450,8 +7450,8 @@ imagemagick_load_image (/* Pointer to emacs frame structure. */ | |||
| 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; |
| @@ -7830,7 +7830,7 @@ DEFUN ("imagemagick-types", Fimagemagick_types, Simagemagick_types, 0, 0, 0, | |||
| 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; |