diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2014-06-02 21:55:38 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2014-06-02 21:55:38 +0400 |
| commit | da11196a248b530c3b3a8329497d71332f8c71a3 (patch) | |
| tree | 164853cec0a694b83de821611180a1d3f50c4a39 /src | |
| parent | 904e7cf8a2de0664c11a2794fa0e183107ab03d7 (diff) | |
| download | emacs-da11196a248b530c3b3a8329497d71332f8c71a3.tar.gz | |
* image.c (x_query_frame_background_color)
[HAVE_PNG || HAVE_NS || HAVE_IMAGEMAGICK || HAVE_RSVG]:
Fix --enable-gcc-warnings compilation without image libraries.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/image.c | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c22b925a1d7..1f321a9df4b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-06-02 Dmitry Antipov <dmantipov@yandex.ru> + + * image.c (x_query_frame_background_color) + [HAVE_PNG || HAVE_NS || HAVE_IMAGEMAGICK || HAVE_RSVG]: + Fix --enable-gcc-warnings compilation without image libraries. + 2014-06-02 Eli Zaretskii <eliz@gnu.org> * w32heap.c (malloc_after_dump, realloc_after_dump): Update the diff --git a/src/image.c b/src/image.c index 304603e7382..3220a45a282 100644 --- a/src/image.c +++ b/src/image.c @@ -1236,6 +1236,9 @@ image_background_transparent (struct image *img, struct frame *f, XImagePtr_or_D return img->background_transparent; } +#if defined (HAVE_PNG) || defined (HAVE_NS) \ + || defined (HAVE_IMAGEMAGICK) || defined (HAVE_RSVG) + /* Store F's background color into *BGCOLOR. */ static void x_query_frame_background_color (struct frame *f, XColor *bgcolor) @@ -1248,7 +1251,8 @@ x_query_frame_background_color (struct frame *f, XColor *bgcolor) #endif } - +#endif /* HAVE_PNG || HAVE_NS || HAVE_IMAGEMAGICK || HAVE_RSVG */ + /*********************************************************************** Helper functions for X image types ***********************************************************************/ |