Fix setinfo.

[xonotic/darkplaces.git] / image_png.c

diff --git a/image_png.c b/image_png.c
index f1ac5458a8f5b657f2b6056987245cb8faa38391..96fb4955049a0e51c26cf479ee3d1cc8261d5663 100644 (file)
--- a/image_png.c
+++ b/image_png.c
@@ -30,6 +30,7 @@
 #include "image.h"
 #include "image_png.h"
 
+
 static void                            (*qpng_set_sig_bytes)           (void*, int);
 static int                             (*qpng_sig_cmp)                         (const unsigned char*, size_t, size_t);
 static void*                   (*qpng_create_read_struct)      (const char*, void*, void(*)(void *png, const char *message), void(*)(void *png, const char *message));
@@ -64,6 +65,18 @@ static void                          (*qpng_write_info)                      (void*, void*);
 static void                            (*qpng_write_row)                       (void*, unsigned char*);
 static void                            (*qpng_write_end)                       (void*, void*);
 
+// libpng 1.4+ longjmp hack
+typedef void (*qpng_longjmp_ptr) (jmp_buf, int);
+static jmp_buf* (*qpng_set_longjmp_fn) (void *, qpng_longjmp_ptr, size_t);
+#define qpng_jmpbuf_14(png_ptr) (*qpng_set_longjmp_fn((png_ptr), longjmp, sizeof (jmp_buf)))
+
+// libpng 1.2 longjmp hack
+#define qpng_jmpbuf_12(png_ptr) (*((jmp_buf *) png_ptr))
+
+// all version support
+#define qpng_jmpbuf(png_ptr) \
+       (qpng_set_longjmp_fn ? qpng_jmpbuf_14(png_ptr) : qpng_jmpbuf_12(png_ptr))
+
 static dllfunction_t pngfuncs[] =
 {
        {"png_set_sig_bytes",           (void **) &qpng_set_sig_bytes},
@@ -101,9 +114,15 @@ static dllfunction_t pngfuncs[] =
        {"png_write_end",                       (void **) &qpng_write_end},
        {NULL, NULL}
 };
+static dllfunction_t png14funcs[] =
+{
+       {"png_set_longjmp_fn",          (void **) &qpng_set_longjmp_fn},
+       {NULL, NULL}
+};
 
 // Handle for PNG DLL
 dllhandle_t png_dll = NULL;
+dllhandle_t png14_dll = NULL;
 
 
 /*
@@ -126,13 +145,22 @@ qboolean 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)
-               "libpng14.0.dylib",
+               "libpng16.16.dylib",
+               "libpng15.15.dylib",
+               "libpng14.14.dylib",
                "libpng12.0.dylib",
 #else
-               "libpng14.so.0",
+               "libpng16.so.16",
+               "libpng15.so.15", // WTF libtool guidelines anyone?
+               "libpng14.so.14", // WTF libtool guidelines anyone?
                "libpng12.so.0",
                "libpng.so", // FreeBSD
 #endif
@@ -144,7 +172,15 @@ qboolean PNG_OpenLibrary (void)
                return true;
 
        // Load the DLL
-       return Sys_LoadLibrary (dllnames, &png_dll, pngfuncs);
+       if(!Sys_LoadLibrary (dllnames, &png_dll, pngfuncs))
+               return false;
+       if(qpng_access_version_number() / 100 >= 104)
+               if(!Sys_LoadLibrary (dllnames, &png14_dll, png14funcs))
+               {
+                       Sys_UnloadLibrary (&png_dll);
+                       return false;
+               }
+       return true;
 }
 
 
@@ -157,6 +193,7 @@ Unload the PNG DLL
 */
 void PNG_CloseLibrary (void)
 {
+       Sys_UnloadLibrary (&png14_dll);
        Sys_UnloadLibrary (&png_dll);
 }
 
@@ -169,7 +206,9 @@ void PNG_CloseLibrary (void)
 */
 
 #define PNG_LIBPNG_VER_STRING_12 "1.2.4"
-#define PNG_LIBPNG_VER_STRING_14 "1.4.1"
+#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
@@ -216,7 +255,7 @@ static struct
 } my_png;
 
 //LordHavoc: removed __cdecl prefix, added overrun protection, and rewrote this to be more efficient
-void PNG_fReadData(void *png, unsigned char *data, size_t length)
+static void PNG_fReadData(void *png, unsigned char *data, size_t length)
 {
        size_t l;
        l = my_png.tmpBuflength - my_png.tmpi;
@@ -233,29 +272,26 @@ void PNG_fReadData(void *png, unsigned char *data, size_t length)
        //Com_HexDumpToConsole(data, (int)length);
 }
 
-void PNG_fWriteData(void *png, unsigned char *data, size_t length)
+static void PNG_fWriteData(void *png, unsigned char *data, size_t length)
 {
        FS_Write(my_png.outfile, data, length);
 }
 
-void PNG_fFlushData(void *png)
+static void PNG_fFlushData(void *png)
 {
 }
 
-void PNG_error_fn(void *png, const char *message)
+static void PNG_error_fn(void *png, const char *message)
 {
        Con_Printf("PNG_LoadImage: error: %s\n", message);
 }
 
-void PNG_warning_fn(void *png, const char *message)
+static void PNG_warning_fn(void *png, const char *message)
 {
        Con_Printf("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)
+unsigned char *PNG_LoadImage_BGRA (const unsigned char *raw, int filesize, int *miplevel)
 {
        unsigned int c;
        unsigned int    y;
@@ -272,7 +308,10 @@ unsigned char *PNG_LoadImage_BGRA (const unsigned char *raw, int filesize)
        if(qpng_sig_cmp(raw, 0, filesize))
                return NULL;
        png = (void *)qpng_create_read_struct(
-               (qpng_access_version_number() / 100 == 102) ? PNG_LIBPNG_VER_STRING_12 : PNG_LIBPNG_VER_STRING_14, // nasty hack to support both libpng12 and libpng14
+               (qpng_access_version_number() / 100 == 102) ? PNG_LIBPNG_VER_STRING_12 :
+               (qpng_access_version_number() / 100 == 104) ? PNG_LIBPNG_VER_STRING_14 :
+               (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)
@@ -284,15 +323,7 @@ unsigned char *PNG_LoadImage_BGRA (const unsigned char *raw, int filesize)
 
        // 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)
-       if (setjmp((int *)png))
-#else
-       if (setjmp((__jmp_buf_tag *)png))
-#endif
-#else
-       if (setjmp(png))
-#endif
+       if (setjmp(qpng_jmpbuf(png)))
        {
                if (my_png.Data)
                        Mem_Free(my_png.Data);
@@ -459,7 +490,10 @@ 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 : PNG_LIBPNG_VER_STRING_14, // nasty hack to support both libpng12 and libpng14
+               (qpng_access_version_number() / 100 == 102) ? PNG_LIBPNG_VER_STRING_12 :
+               (qpng_access_version_number() / 100 == 104) ? PNG_LIBPNG_VER_STRING_14 :
+               (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)
@@ -478,8 +512,12 @@ 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))
+#elif defined(__ANDROID__)
+       if (setjmp((long *)png))
 #else
        if (setjmp((__jmp_buf_tag *)png))
 #endif