[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.4 emacs/src/image.c:1.6.2.5
*** emacs/src/image.c:1.6.2.4   Tue Jul  6 09:14:34 2004
--- emacs/src/image.c   Tue Jul  6 09:39:56 2004
***************
*** 213,219 ****
  {
    UnlockPixels (GetGWorldPixMap (ximg));
  }
! #endif
  
  
  /* Functions to access the contents of a bitmap, given an id.  */
--- 213,219 ----
  {
    UnlockPixels (GetGWorldPixMap (ximg));
  }
! #endif /* MAC_OS */
  
  
  /* Functions to access the contents of a bitmap, given an id.  */
***************
*** 1596,1601 ****
--- 1596,1606 ----
       Lisp_Object spec;
  {
    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
    struct image *img;
    int i;
    unsigned hash;
***************
*** 4238,4244 ****
  }
  
  #endif /* MAC_OS */
!  
  
  
  /***********************************************************************
--- 4243,4249 ----
  }
  
  #endif /* MAC_OS */
! 
  
  
  /***********************************************************************
***************
*** 5688,5693 ****
--- 5693,5704 ----
     PNG_PTR is a pointer to the PNG control structure.  Copy LENGTH
     bytes from the input to DATA.  */
  
+ #ifdef _MSC_VER
+   /* Work around a problem with MinGW builds of graphics libraries
+      not honoring calling conventions.  */
+ #pragma optimize("g", off)
+ #endif
+ 
  static void
  png_read_from_memory (png_ptr, data, length)
       png_structp png_ptr;
***************
*** 5704,5709 ****
--- 5715,5725 ----
    tbr->index = tbr->index + length;
  }
  
+ #ifdef _MSC_VER
+ /* Restore normal optimization, as specified on the command line.  */
+ #pragma optimize("", on)
+ #endif
+ 
  /* Load PNG image IMG for use on frame F.  Value is non-zero if
     successful.  */