X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=image_png.c;h=6b226af060d7f4f1eb85276a1ca3f8b08216757c;hb=e4147673fc518d5d80fdb8b16fb736712600fc50;hp=f8d50151b7e98a2f1e8d027528cd5564a42924a7;hpb=bdda65ec4ede57a1d8d52219d63687595d57328a;p=xonotic%2Fdarkplaces.git

diff --git a/image_png.c b/image_png.c
index f8d50151..6b226af0 100644
--- a/image_png.c
+++ b/image_png.c
@@ -1,5 +1,5 @@
 /*
-	Copyright (C) 2006  Serge "(515)" Ziryukin, Forest "LordHavoc" Hale
+	Copyright (C) 2006  Serge "(515)" Ziryukin, Ashley Rose Hale (LadyHavoc)
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -24,9 +24,9 @@
 //[515]: png implemented into DP ONLY FOR TESTING 2d stuff with csqc
 // so delete this bullshit :D
 //
-//LordHavoc: rewrote most of this.
+//LadyHavoc: rewrote most of this.
 
-#include "quakedef.h"
+#include "darkplaces.h"
 #include "image.h"
 #include "image_png.h"
 
@@ -140,21 +140,25 @@ PNG_OpenLibrary
 Try to load the PNG DLL
 ====================
 */
-qboolean PNG_OpenLibrary (void)
+qbool PNG_OpenLibrary (void)
 {
 	const char* dllnames [] =
 	{
 #if WIN32
+		"libpng16.dll",
+		"libpng16-16.dll",
 		"libpng15-15.dll",
 		"libpng15.dll",
 		"libpng14-14.dll",
 		"libpng14.dll",
 		"libpng12.dll",
 #elif defined(MACOSX)
+		"libpng16.16.dylib",
 		"libpng15.15.dylib",
 		"libpng14.14.dylib",
 		"libpng12.0.dylib",
 #else
+		"libpng16.so.16",
 		"libpng15.so.15", // WTF libtool guidelines anyone?
 		"libpng14.so.14", // WTF libtool guidelines anyone?
 		"libpng12.so.0",
@@ -168,12 +172,12 @@ qboolean PNG_OpenLibrary (void)
 		return true;
 
 	// Load the DLL
-	if(!Sys_LoadLibrary (dllnames, &png_dll, pngfuncs))
+	if(!Sys_LoadDependency (dllnames, &png_dll, pngfuncs))
 		return false;
 	if(qpng_access_version_number() / 100 >= 104)
-		if(!Sys_LoadLibrary (dllnames, &png14_dll, png14funcs))
+		if(!Sys_LoadDependency (dllnames, &png14_dll, png14funcs))
 		{
-			Sys_UnloadLibrary (&png_dll);
+			Sys_FreeLibrary (&png_dll);
 			return false;
 		}
 	return true;
@@ -189,8 +193,8 @@ Unload the PNG DLL
 */
 void PNG_CloseLibrary (void)
 {
-	Sys_UnloadLibrary (&png14_dll);
-	Sys_UnloadLibrary (&png_dll);
+	Sys_FreeLibrary (&png14_dll);
+	Sys_FreeLibrary (&png_dll);
 }
 
 /*
@@ -204,6 +208,7 @@ void PNG_CloseLibrary (void)
 #define PNG_LIBPNG_VER_STRING_12 "1.2.4"
 #define PNG_LIBPNG_VER_STRING_14 "1.4.0"
 #define PNG_LIBPNG_VER_STRING_15 "1.5.0"
+#define PNG_LIBPNG_VER_STRING_16 "1.6.0"
 
 #define PNG_COLOR_MASK_PALETTE    1
 #define PNG_COLOR_MASK_COLOR      2
@@ -249,7 +254,7 @@ static struct
 	qfile_t *outfile;
 } my_png;
 
-//LordHavoc: removed __cdecl prefix, added overrun protection, and rewrote this to be more efficient
+//LadyHavoc: removed __cdecl prefix, added overrun protection, and rewrote this to be more efficient
 static void PNG_fReadData(void *png, unsigned char *data, size_t length)
 {
 	size_t l;
@@ -278,17 +283,14 @@ static void PNG_fFlushData(void *png)
 
 static void PNG_error_fn(void *png, const char *message)
 {
-	Con_Printf("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_Printf("PNG_LoadImage: warning: %s\n", message);
+	Con_Printf(CON_WARN "PNG_LoadImage: warning: %s\n", message);
 }
 
-extern int	image_width;
-extern int	image_height;
-
 unsigned char *PNG_LoadImage_BGRA (const unsigned char *raw, int filesize, int *miplevel)
 {
 	unsigned int c;
@@ -308,7 +310,8 @@ unsigned char *PNG_LoadImage_BGRA (const unsigned char *raw, int filesize, int *
 	png = (void *)qpng_create_read_struct(
 		(qpng_access_version_number() / 100 == 102) ? PNG_LIBPNG_VER_STRING_12 :
 		(qpng_access_version_number() / 100 == 104) ? PNG_LIBPNG_VER_STRING_14 :
-		PNG_LIBPNG_VER_STRING_15, // nasty hack... whatever
+		(qpng_access_version_number() / 100 == 105) ? PNG_LIBPNG_VER_STRING_15 :
+		PNG_LIBPNG_VER_STRING_16, // nasty hack... whatever
 		0, PNG_error_fn, PNG_warning_fn
 	);
 	if(!png)
@@ -471,7 +474,7 @@ PNG_SaveImage_preflipped
 Save a preflipped PNG image to a file
 ====================
 */
-qboolean PNG_SaveImage_preflipped (const char *filename, int width, int height, qboolean has_alpha, unsigned char *data)
+qbool PNG_SaveImage_preflipped (const char *filename, int width, int height, qbool has_alpha, unsigned char *data)
 {
 	unsigned int offset, linesize;
 	qfile_t* file = NULL;
@@ -489,7 +492,8 @@ qboolean PNG_SaveImage_preflipped (const char *filename, int width, int height,
 	png = (void *)qpng_create_write_struct( 
 		(qpng_access_version_number() / 100 == 102) ? PNG_LIBPNG_VER_STRING_12 :
 		(qpng_access_version_number() / 100 == 104) ? PNG_LIBPNG_VER_STRING_14 :
-		PNG_LIBPNG_VER_STRING_15, // nasty hack... whatever
+		(qpng_access_version_number() / 100 == 105) ? PNG_LIBPNG_VER_STRING_15 :
+		PNG_LIBPNG_VER_STRING_16, // nasty hack... whatever
 		0, PNG_error_fn, PNG_warning_fn
 	);
 	if(!png)
@@ -507,16 +511,14 @@ 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)
 	if (setjmp((int *)png))
+#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);