[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/image.c
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/src/image.c |
Date: |
Tue, 01 Jun 2004 20:54:11 -0400 |
Index: emacs/src/image.c
diff -c emacs/src/image.c:1.11 emacs/src/image.c:1.12
*** emacs/src/image.c:1.11 Wed May 12 02:23:37 2004
--- emacs/src/image.c Wed Jun 2 00:50:09 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;
***************
*** 5703,5708 ****
--- 5714,5724 ----
bcopy (tbr->bytes + tbr->index, data, length);
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. */
- [Emacs-diffs] Changes to emacs/src/image.c,
Juanma Barranquero <=