[Emacs-diffs] Changes to emacs/src/image.c [lexbind]

[Miles Bader]

Index: emacs/src/image.c
diff -c emacs/src/image.c:1.6.2.8 emacs/src/image.c:1.6.2.9
*** emacs/src/image.c:1.6.2.8   Tue Jul  6 10:17:20 2004
--- emacs/src/image.c   Tue Jul  6 10:27:00 2004
***************
*** 675,681 ****
        success = Qt;
      }
  
!   CACHE_IMAGE_TYPE(*type->type, success);
    return success;
  }
  
--- 675,681 ----
        success = Qt;
      }
  
!   CACHE_IMAGE_TYPE (*type->type, success);
    return success;
  }
  
***************
*** 690,696 ****
    struct image_type *type;
  
    /* We must initialize the image-type if it hasn't been already.  */
!   if (NILP (Finit_image_library (symbol)))
      return 0;                 /* unimplemented */
  
    for (type = image_types; type; type = type->next)
--- 690,696 ----
    struct image_type *type;
  
    /* We must initialize the image-type if it hasn't been already.  */
!   if (NILP (Finit_image_library (symbol, Qnil)))
      return 0;                 /* unimplemented */
  
    for (type = image_types; type; type = type->next)
***************
*** 7927,7936 ****
  #ifdef HAVE_NTGUI
  /* Image types that rely on external libraries are loaded dynamically
     if the library is available.  */
! #define CHECK_LIB_AVAILABLE(image_type, init_lib_fn) \
    define_image_type (image_type, init_lib_fn (libraries))
  #else
! #define CHECK_LIB_AVAILABLE(image_type, init_lib_fn) \
    define_image_type (image_type, TRUE)
  #endif /* HAVE_NTGUI */
  
--- 7927,7936 ----
  #ifdef HAVE_NTGUI
  /* Image types that rely on external libraries are loaded dynamically
     if the library is available.  */
! #define CHECK_LIB_AVAILABLE(image_type, init_lib_fn, libraries) \
    define_image_type (image_type, init_lib_fn (libraries))
  #else
! #define CHECK_LIB_AVAILABLE(image_type, init_lib_fn, libraries) \
    define_image_type (image_type, TRUE)
  #endif /* HAVE_NTGUI */
  
***************
*** 7940,7947 ****
  
  Image types pbm and xbm are prebuilt; other types are loaded here.
  Libraries to load are specified in alist LIBRARIES (usually, the value
! of `image-library-alist', which see.  */)
    (type, libraries)
  {
    Lisp_Object tested;
  
--- 7940,7948 ----
  
  Image types pbm and xbm are prebuilt; other types are loaded here.
  Libraries to load are specified in alist LIBRARIES (usually, the value
! of `image-library-alist', which see).  */)
    (type, libraries)
+   Lisp_Object type, libraries;
  {
    Lisp_Object tested;
  
***************
*** 7952,7987 ****
  
  #if defined (HAVE_XPM) || defined (MAC_OS)
    if (EQ (type, Qxpm))
!     return CHECK_LIB_AVAILABLE(&xpm_type, init_xpm_functions);
  #endif
  
  #if defined (HAVE_JPEG) || defined (MAC_OS)
    if (EQ (type, Qjpeg))
!     return CHECK_LIB_AVAILABLE(&jpeg_type, init_jpeg_functions);
  #endif
  
  #if defined (HAVE_TIFF) || defined (MAC_OS)
    if (EQ (type, Qtiff))
!     return CHECK_LIB_AVAILABLE(&tiff_type, init_tiff_functions);
  #endif
  
  #if defined (HAVE_GIF) || defined (MAC_OS)
    if (EQ (type, Qgif))
!     return CHECK_LIB_AVAILABLE(&gif_type, init_gif_functions);
  #endif
  
  #if defined (HAVE_PNG) || defined (MAC_OS)
    if (EQ (type, Qpng))
!     return CHECK_LIB_AVAILABLE(&png_type, init_png_functions);
  #endif
  
  #ifdef HAVE_GHOSTSCRIPT
    if (EQ (type, Qpostscript))
!     return CHECK_LIB_AVAILABLE(&gs_type, init_gs_functions);
  #endif
  
    /* If the type is not recognized, avoid testing it ever again.  */
!   CACHE_IMAGE_TYPE(type, Qnil);
    return Qnil;
  }
  
--- 7953,7988 ----
  
  #if defined (HAVE_XPM) || defined (MAC_OS)
    if (EQ (type, Qxpm))
!     return CHECK_LIB_AVAILABLE (&xpm_type, init_xpm_functions, libraries);
  #endif
  
  #if defined (HAVE_JPEG) || defined (MAC_OS)
    if (EQ (type, Qjpeg))
!     return CHECK_LIB_AVAILABLE (&jpeg_type, init_jpeg_functions, libraries);
  #endif
  
  #if defined (HAVE_TIFF) || defined (MAC_OS)
    if (EQ (type, Qtiff))
!     return CHECK_LIB_AVAILABLE (&tiff_type, init_tiff_functions, libraries);
  #endif
  
  #if defined (HAVE_GIF) || defined (MAC_OS)
    if (EQ (type, Qgif))
!     return CHECK_LIB_AVAILABLE (&gif_type, init_gif_functions, libraries);
  #endif
  
  #if defined (HAVE_PNG) || defined (MAC_OS)
    if (EQ (type, Qpng))
!     return CHECK_LIB_AVAILABLE (&png_type, init_png_functions, libraries);
  #endif
  
  #ifdef HAVE_GHOSTSCRIPT
    if (EQ (type, Qpostscript))
!     return CHECK_LIB_AVAILABLE (&gs_type, init_gs_functions, libraries);
  #endif
  
    /* If the type is not recognized, avoid testing it ever again.  */
!   CACHE_IMAGE_TYPE (type, Qnil);
    return Qnil;
  }