procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* image.c (x_query_frame_background_color)

Browse source 
[HAVE_PNG || HAVE_NS || HAVE_IMAGEMAGICK || HAVE_RSVG]:
Fix --enable-gcc-warnings compilation without image libraries.
This commit is contained in:
Dmitry Antipov 2014-06-02 21:55:38 +04:00
parent 904e7cf8a2
commit da11196a24
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -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

6
src/image.c
View file

@ -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
***********************************************************************/