mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-03 11:33:37 +00:00
Code Issues Releases Activity

(lookup_image, png_read_from_memory): Remove hacks (and misleading comments).

Browse Source 
(DEF_IMGLIB_FN): Use C calling convention for image libraries.
This commit is contained in:
Juanma Barranquero 2005-05-20 17:51:38 +00:00
parent 57d8ef63ee
commit 09e8eb5bae
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2005-05-20 Juanma Barranquero <lekktu@gmail.com>
* image.c (lookup_image, png_read_from_memory): Remove hacks (and
misleading comments).
(DEF_IMGLIB_FN): Use C calling convention for image libraries.
2005-05-20 KOBAYASHI Yasuhiro <kobayays@otsukakj.co.jp> 2005-05-20 KOBAYASHI Yasuhiro <kobayays@otsukakj.co.jp>
* window.c (Fwindow_inside_edges, Fwindow_inside_pixel_edges): * window.c (Fwindow_inside_edges, Fwindow_inside_pixel_edges):

17
src/image.c
View File

@ -1631,11 +1631,6 @@ lookup_image (f, spec)
Lisp_Object spec; Lisp_Object spec;
{ {
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
struct image *img; struct image *img;
int i; int i;
unsigned hash; unsigned hash;
@ -1815,7 +1810,7 @@ forall_images_in_image_cache (f, fn)
#ifdef HAVE_NTGUI #ifdef HAVE_NTGUI
/* Macro for defining functions that will be loaded from image DLLs. */ /* Macro for defining functions that will be loaded from image DLLs. */
#define DEF_IMGLIB_FN(func) FARPROC fn_##func #define DEF_IMGLIB_FN(func) int (FAR CDECL *fn_##func)()
/* Macro for loading those image functions from the library. */ /* Macro for loading those image functions from the library. */
#define LOAD_IMGLIB_FN(lib,func) { \ #define LOAD_IMGLIB_FN(lib,func) { \
@ -5744,12 +5739,6 @@ struct png_memory_storage
PNG_PTR is a pointer to the PNG control structure. Copy LENGTH PNG_PTR is a pointer to the PNG control structure. Copy LENGTH
bytes from the input to DATA. */ 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 static void
png_read_from_memory (png_ptr, data, length) png_read_from_memory (png_ptr, data, length)
png_structp png_ptr; png_structp png_ptr;
@ -5766,10 +5755,6 @@ png_read_from_memory (png_ptr, data, length)
tbr->index = tbr->index + 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 /* Load PNG image IMG for use on frame F. Value is non-zero if
successful. */ successful. */