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

Fix build failure with --with-cairo --without-png

Browse source 
* src/image.c: Don't enable PNG section only by USE_CAIRO.
This commit is contained in:
YAMAMOTO Mitsuharu 2020-01-15 17:10:30 +09:00
parent c34f7e884b
commit 0e936f18f8
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/image.c
View file

@ -6235,7 +6235,7 @@ pbm_load (struct frame *f, struct image *img)
PNG PNG
***********************************************************************/ ***********************************************************************/
#if defined (HAVE_PNG) || defined (HAVE_NS) || defined (USE_CAIRO) #if defined (HAVE_PNG) || defined (HAVE_NS)
/* Indices of image specification fields in png_format, below. */ /* Indices of image specification fields in png_format, below. */
@ -6286,10 +6286,10 @@ png_image_p (Lisp_Object object)
return fmt[PNG_FILE].count + fmt[PNG_DATA].count == 1; return fmt[PNG_FILE].count + fmt[PNG_DATA].count == 1;
} }
#endif /* HAVE_PNG || HAVE_NS || USE_CAIRO */ #endif /* HAVE_PNG || HAVE_NS */
#if (defined HAVE_PNG && !defined HAVE_NS) || defined USE_CAIRO #if defined HAVE_PNG && !defined HAVE_NS
# ifdef WINDOWSNT # ifdef WINDOWSNT
/* PNG library details. */ /* PNG library details. */
@ -10164,7 +10164,7 @@ static struct image_type const image_types[] =
{ SYMBOL_INDEX (Qsvg), svg_image_p, svg_load, image_clear_image, { SYMBOL_INDEX (Qsvg), svg_image_p, svg_load, image_clear_image,
IMAGE_TYPE_INIT (init_svg_functions) }, IMAGE_TYPE_INIT (init_svg_functions) },
#endif #endif
#if defined HAVE_PNG || defined HAVE_NS || defined USE_CAIRO #if defined HAVE_PNG || defined HAVE_NS
{ SYMBOL_INDEX (Qpng), png_image_p, png_load, image_clear_image, { SYMBOL_INDEX (Qpng), png_image_p, png_load, image_clear_image,
IMAGE_TYPE_INIT (init_png_functions) }, IMAGE_TYPE_INIT (init_png_functions) },
#endif #endif