/[emacs]/emacs/src/image.c
ViewVC logotype

Diff of /emacs/src/image.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.23 by rms, Tue May 10 09:16:46 2005 UTC revision 1.24 by lektu, Fri May 20 17:50:59 2005 UTC
# Line 1631  lookup_image (f, spec) Line 1631  lookup_image (f, spec)
1631       Lisp_Object spec;       Lisp_Object spec;
1632  {  {
1633    struct image_cache *c = FRAME_X_IMAGE_CACHE (f);    struct image_cache *c = FRAME_X_IMAGE_CACHE (f);
 #ifdef _MSC_VER  
   /* Work around a problem with MinGW builds of graphics libraries  
      not honoring calling conventions.  */  
   static  
 #endif  
1634    struct image *img;    struct image *img;
1635    int i;    int i;
1636    unsigned hash;    unsigned hash;
# Line 1815  forall_images_in_image_cache (f, fn) Line 1810  forall_images_in_image_cache (f, fn)
1810  #ifdef HAVE_NTGUI  #ifdef HAVE_NTGUI
1811    
1812  /* Macro for defining functions that will be loaded from image DLLs.  */  /* Macro for defining functions that will be loaded from image DLLs.  */
1813  #define DEF_IMGLIB_FN(func) FARPROC fn_##func  #define DEF_IMGLIB_FN(func) int (FAR CDECL *fn_##func)()
1814    
1815  /* Macro for loading those image functions from the library.  */  /* Macro for loading those image functions from the library.  */
1816  #define LOAD_IMGLIB_FN(lib,func) {                                      \  #define LOAD_IMGLIB_FN(lib,func) {                                      \
# Line 5744  struct png_memory_storage Line 5739  struct png_memory_storage
5739     PNG_PTR is a pointer to the PNG control structure.  Copy LENGTH     PNG_PTR is a pointer to the PNG control structure.  Copy LENGTH
5740     bytes from the input to DATA.  */     bytes from the input to DATA.  */
5741    
 #ifdef _MSC_VER  
   /* Work around a problem with MinGW builds of graphics libraries  
      not honoring calling conventions.  */  
 #pragma optimize("g", off)  
 #endif  
   
5742  static void  static void
5743  png_read_from_memory (png_ptr, data, length)  png_read_from_memory (png_ptr, data, length)
5744       png_structp png_ptr;       png_structp png_ptr;
# Line 5766  png_read_from_memory (png_ptr, data, len Line 5755  png_read_from_memory (png_ptr, data, len
5755    tbr->index = tbr->index + length;    tbr->index = tbr->index + length;
5756  }  }
5757    
 #ifdef _MSC_VER  
 /* Restore normal optimization, as specified on the command line.  */  
 #pragma optimize("", on)  
 #endif  
5758    
5759  /* Load PNG image IMG for use on frame F.  Value is non-zero if  /* Load PNG image IMG for use on frame F.  Value is non-zero if
5760     successful.  */     successful.  */

Legend:
Removed from v.1.23  
changed lines
  Added in v.1.24

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26