X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=image_png.c;h=4267331be738462ceaacfd07541f5bedab60861a;hb=4bfb0cbab250c020cfb990f347366f1a4eca79cd;hp=0b9543e8742890d76955e5cf814f9e24d0f35e12;hpb=bf54dd6e7fb965287073b669235a7b30c7f96923;p=xonotic%2Fdarkplaces.git

diff --git a/image_png.c b/image_png.c
index 0b9543e8..4267331b 100644
--- a/image_png.c
+++ b/image_png.c
@@ -126,6 +126,7 @@ qboolean PNG_OpenLibrary (void)
 	const char* dllnames [] =
 	{
 #if WIN32
+		"libpng14-14.dll",
 		"libpng14.dll",
 		"libpng12.dll",
 #elif defined(MACOSX)
@@ -285,7 +286,9 @@ unsigned char *PNG_LoadImage_BGRA (const unsigned char *raw, int filesize, int *
 	// NOTE: this relies on jmp_buf being the first thing in the png structure
 	// created by libpng! (this is correct for libpng 1.2.x)
 #ifdef __cplusplus
-#if defined(MACOSX) || defined(WIN32)
+#ifdef WIN64
+	if (setjmp((_JBTYPE *)png))
+#elif defined(MACOSX) || defined(WIN32)
 	if (setjmp((int *)png))
 #else
 	if (setjmp((__jmp_buf_tag *)png))
@@ -478,7 +481,9 @@ qboolean PNG_SaveImage_preflipped (const char *filename, int width, int height,
 	// NOTE: this relies on jmp_buf being the first thing in the png structure
 	// created by libpng! (this is correct for libpng 1.2.x)
 #ifdef __cplusplus
-#if defined(MACOSX) || defined(WIN32)
+#ifdef WIN64
+	if (setjmp((_JBTYPE *)png))
+#elif defined(MACOSX) || defined(WIN32)
 	if (setjmp((int *)png))
 #else
 	if (setjmp((__jmp_buf_tag *)png))