From 2f142cc515f795f22c96464d97b28a7d8226c578 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 10 May 2011 12:31:33 +0200 Subject: [PATCH] src/image.c (Finit_image_library): Return t for built-in image types (bug#8640). --- src/ChangeLog | 5 +++++ src/image.c | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6f70908caae..f7010859baa 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-05-10 Juanma Barranquero + + * image.c (Finit_image_library): Return t for built-in image types, + like pbm and xbm. (Bug#8640) + 2011-05-09 Andreas Schwab * w32menu.c (set_frame_menubar): Fix submenu allocation. diff --git a/src/image.c b/src/image.c index 747142635af..23da03b6264 100644 --- a/src/image.c +++ b/src/image.c @@ -8609,6 +8609,10 @@ of `dynamic-library-alist', which see). */) return XCDR (tested); #endif + /* Types pbm and xbm are built-in and always available. */ + if (EQ (type, Qpbm) || EQ (type, Qxbm)) + return Qt; + #if defined (HAVE_XPM) || defined (HAVE_NS) if (EQ (type, Qxpm)) return CHECK_LIB_AVAILABLE (&xpm_type, init_xpm_functions, libraries); @@ -8641,10 +8645,8 @@ of `dynamic-library-alist', which see). */) #if defined (HAVE_IMAGEMAGICK) if (EQ (type, Qimagemagick)) - { - return CHECK_LIB_AVAILABLE (&imagemagick_type, init_imagemagick_functions, - libraries); - } + return CHECK_LIB_AVAILABLE (&imagemagick_type, init_imagemagick_functions, + libraries); #endif #ifdef HAVE_GHOSTSCRIPT -- 2.39.2