diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2013-07-08 15:26:13 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2013-07-08 15:26:13 +0200 |
| commit | e4b1e5afb4793638ca103cc1ba70c83a8a756e54 (patch) | |
| tree | e18023252d98c9a2c7a5393a001174964bd62b59 /src | |
| parent | 6388fe5e472c9bcfcd89b83c5818e7544502377f (diff) | |
| download | emacs-e4b1e5afb4793638ca103cc1ba70c83a8a756e54.tar.gz | |
configure.ac (HAVE_IMAGEMAGICK): Check on NS also.
image.c (imagemagick_load_image): Do not use MagickExportImagePixels
on NS even if it is present. Pixmap on NS is a void*.
Fixes: debbugs:14798
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/image.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 462a246f220..9be0b59ee06 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-07-08 Magnus Henoch <magnus.henoch@gmail.com> (tiny change). + + * image.c (imagemagick_load_image): Do not use MagickExportImagePixels + on NS even if it is present. Pixmap on NS is a void*. + 2013-07-07 Paul Eggert <eggert@cs.ucla.edu> Port to Ubuntu 10 (Bug#14803). diff --git a/src/image.c b/src/image.c index 7ecd59d27b4..6ef3754e005 100644 --- a/src/image.c +++ b/src/image.c @@ -8054,7 +8054,7 @@ imagemagick_load_image (struct frame *f, struct image *img, init_color_table (); -#ifdef HAVE_MAGICKEXPORTIMAGEPIXELS +#if defined(HAVE_MAGICKEXPORTIMAGEPIXELS) && ! defined(HAVE_NS) if (imagemagick_render_type != 0) { /* Magicexportimage is normally faster than pixelpushing. This |