diff options
| author | Paul Eggert | 2014-05-06 14:13:37 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-05-06 14:13:37 -0700 |
| commit | f62bc934f022be3c4af03ec9877f4ba32628822e (patch) | |
| tree | c9e308f3bb6e2d1e199301790ebf9b85a1dc9570 /src/ChangeLog | |
| parent | 2ddb358900f579f626fe2bf27d1fa1327e4fb9ab (diff) | |
| download | emacs-f62bc934f022be3c4af03ec9877f4ba32628822e.tar.gz emacs-f62bc934f022be3c4af03ec9877f4ba32628822e.zip | |
* image.c: Do not use libpng if HAVE_NS, as NS does its own thing.
[HAVE_NS]: Do not include png.h.
(x_query_frame_background_color): New function.
(png_load_body, imagemagick_load_image, svg_load_image): Use it.
(png_load_body): Coalesce duplicate code.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 01569db30e6..f8b12fafca0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2014-05-06 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * image.c: Do not use libpng if HAVE_NS, as NS does its own thing. | ||
| 4 | [HAVE_NS]: Do not include png.h. | ||
| 5 | (x_query_frame_background_color): New function. | ||
| 6 | (png_load_body, imagemagick_load_image, svg_load_image): Use it. | ||
| 7 | (png_load_body): Coalesce duplicate code. | ||
| 8 | |||
| 1 | 2014-05-04 Paul Eggert <eggert@cs.ucla.edu> | 9 | 2014-05-04 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 10 | ||
| 3 | Consult libpng-config more consistently (Bug#17339). | 11 | Consult libpng-config more consistently (Bug#17339). |