X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=image_png.c;h=7ef74f9a54a1f1445e65246e9cbb0c4b0d32fbd4;hb=a724f1166c2d285fd45215f3c3ce455ece3d0725;hp=967d6f732fe83015488f16ff35bc69decf7e1952;hpb=1b5e3869f0fd3e2fe323680784610d48d6efddca;p=xonotic%2Fdarkplaces.git

diff --git a/image_png.c b/image_png.c
index 967d6f73..7ef74f9a 100644
--- a/image_png.c
+++ b/image_png.c
@@ -283,12 +283,12 @@ static void PNG_fFlushData(void *png)
 
 static void PNG_error_fn(void *png, const char *message)
 {
-	Con_Errorf("PNG_LoadImage: error: %s\n", message);
+	Con_Printf(CON_ERROR "PNG_LoadImage: error: %s\n", message);
 }
 
 static void PNG_warning_fn(void *png, const char *message)
 {
-	Con_Warnf("PNG_LoadImage: warning: %s\n", message);
+	Con_Printf(CON_WARN "PNG_LoadImage: warning: %s\n", message);
 }
 
 unsigned char *PNG_LoadImage_BGRA (const unsigned char *raw, int filesize, int *miplevel)
@@ -511,7 +511,6 @@ 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
 #ifdef WIN64
 	if (setjmp((_JBTYPE *)png))
 #elif defined(MACOSX) || defined(WIN32)
@@ -519,10 +518,7 @@ qboolean PNG_SaveImage_preflipped (const char *filename, int width, int height,
 #elif defined(__ANDROID__)
 	if (setjmp((long *)png))
 #else
-	if (setjmp((__jmp_buf_tag *)png))
-#endif
-#else
-	if (setjmp(png))
+	if (setjmp((struct __jmp_buf_tag *)png))
 #endif
 	{
 		qpng_destroy_write_struct(&png, &pnginfo);