Commit 1ab0dee5 authored by Andreas Schwab's avatar Andreas Schwab
Browse files

* src/image.c (imagemagick_load_image): Fix type mismatch.

(Fimagemagick_types): Likewise.
parent b6e3633c
2011-06-11 Andreas Schwab <schwab@linux-m68k.org> 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. * window.h (replace_buffer_in_windows): Declare.
2011-06-11 Martin Rudalics <rudalics@gmx.at> 2011-06-11 Martin Rudalics <rudalics@gmx.at>
......
...@@ -7480,8 +7480,8 @@ imagemagick_load_image (struct frame *f, struct image *img, ...@@ -7480,8 +7480,8 @@ imagemagick_load_image (struct frame *f, struct image *img,
unsigned char *contents, unsigned int size, unsigned char *contents, unsigned int size,
char *filename) char *filename)
{ {
unsigned long width; size_t width;
unsigned long height; size_t height;
MagickBooleanType status; MagickBooleanType status;
...@@ -7858,7 +7858,7 @@ recognize as images, such as C. See `imagemagick-types-inhibit'. */) ...@@ -7858,7 +7858,7 @@ recognize as images, such as C. See `imagemagick-types-inhibit'. */)
(void) (void)
{ {
Lisp_Object typelist = Qnil; Lisp_Object typelist = Qnil;
unsigned long numf = 0; size_t numf = 0;
ExceptionInfo ex; ExceptionInfo ex;
char **imtypes = GetMagickList ("*", &numf, &ex); char **imtypes = GetMagickList ("*", &numf, &ex);
int i; int i;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment