Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
1ab0dee5
Commit
1ab0dee5
authored
Jun 11, 2011
by
Andreas Schwab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* src/image.c (imagemagick_load_image): Fix type mismatch.
(Fimagemagick_types): Likewise.
parent
b6e3633c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
src/ChangeLog
src/ChangeLog
+3
-0
src/image.c
src/image.c
+3
-3
No files found.
src/ChangeLog
View file @
1ab0dee5
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>
...
...
src/image.c
View file @
1ab0dee5
...
...
@@ -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;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment