src/image.c (Finit_image_library): Return t for built-in image types (bug#8640).

diff --git a/src/ChangeLog b/src/ChangeLog
index 6f70908caae73419a624ecb2089b47ed54d44e99..f7010859baa26100a45a4248905301ff592376a4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-10  Juanma Barranquero  <lekktu@gmail.com>
+
+       * image.c (Finit_image_library): Return t for built-in image types,
+       like pbm and xbm.  (Bug#8640)
+
 2011-05-09  Andreas Schwab  <schwab@linux-m68k.org>
 
        * w32menu.c (set_frame_menubar): Fix submenu allocation.

diff --git a/src/image.c b/src/image.c
index 747142635afef306b50fd9aa8dee5919998a1adb..23da03b6264bfac91e4e557cdd56ed5acce081fe 100644 (file)
--- 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