diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2011-06-11 12:11:07 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2011-06-11 12:11:07 +0200 |
| commit | 1ab0dee5ca2b1368770aac0f796959c95f18ed89 (patch) | |
| tree | 988c4583ff97950cc61f6b4545a276d1e93b9316 | |
| parent | b6e3633cafd7d7b370bca5ce2437fe5096144cb1 (diff) | |
| download | emacs-1ab0dee5ca2b1368770aac0f796959c95f18ed89.tar.gz | |
* src/image.c (imagemagick_load_image): Fix type mismatch.
(Fimagemagick_types): Likewise.
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/image.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 92130c35050..46926778345 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2011-06-11 Andreas Schwab <schwab@linux-m68k.org> + * image.c (imagemagick_load_image): Fix type mismatch. + (Fimagemagick_types): Likewise. + * window.h (replace_buffer_in_windows): Declare. 2011-06-11 Martin Rudalics <rudalics@gmx.at> diff --git a/src/image.c b/src/image.c index b755d741443..b381e990dab 100644 --- a/src/image.c +++ b/src/image.c @@ -7480,8 +7480,8 @@ imagemagick_load_image (struct frame *f, struct image *img, 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 @@ recognize as images, such as C. See `imagemagick-types-inhibit'. */) (void) { Lisp_Object typelist = Qnil; - unsigned long numf = 0; + size_t numf = 0; ExceptionInfo ex; char **imtypes = GetMagickList ("*", &numf, &ex); int i; |