diff options
| author | Jan Djärv | 2013-07-08 15:26:13 +0200 |
|---|---|---|
| committer | Jan Djärv | 2013-07-08 15:26:13 +0200 |
| commit | e4b1e5afb4793638ca103cc1ba70c83a8a756e54 (patch) | |
| tree | e18023252d98c9a2c7a5393a001174964bd62b59 /src/ChangeLog | |
| parent | 6388fe5e472c9bcfcd89b83c5818e7544502377f (diff) | |
| download | emacs-e4b1e5afb4793638ca103cc1ba70c83a8a756e54.tar.gz emacs-e4b1e5afb4793638ca103cc1ba70c83a8a756e54.zip | |
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/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 462a246f220..9be0b59ee06 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-07-08 Magnus Henoch <magnus.henoch@gmail.com> (tiny change). | ||
| 2 | |||
| 3 | * image.c (imagemagick_load_image): Do not use MagickExportImagePixels | ||
| 4 | on NS even if it is present. Pixmap on NS is a void*. | ||
| 5 | |||
| 1 | 2013-07-07 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2013-07-07 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Port to Ubuntu 10 (Bug#14803). | 8 | Port to Ubuntu 10 (Bug#14803). |