X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=image_png.c;h=7ef74f9a54a1f1445e65246e9cbb0c4b0d32fbd4;hb=220bfb551bac9181cd121366a3c858ef1499fcdf;hp=3965a50e1ca8ea6fdb5299943ed70838438c34d3;hpb=50c0fce741481cf340d6bb2d3224210c120220a8;p=xonotic%2Fdarkplaces.git diff --git a/image_png.c b/image_png.c index 3965a50e..7ef74f9a 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,26 +24,12 @@ //[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 "image.h" #include "image_png.h" -/* -#ifdef __cplusplus -#ifdef WIN64 -typedef _JBTYPE *qpng_jmpbuf_t; -#elif defined(MACOSX) || defined(WIN32) -typedef int *qpng_jmpbuf_t; -#else -typedef __jmp_buf_tag *qpng_jmpbuf_t; -#endif -#else -typedef void *qpng_jmpbuf_t; -#endif -*/ -typedef jmp_buf qpng_jmpbuf_t; static void (*qpng_set_sig_bytes) (void*, int); static int (*qpng_sig_cmp) (const unsigned char*, size_t, size_t); @@ -78,7 +64,18 @@ static unsigned int (*qpng_access_version_number) (void); // FIXME is this re static void (*qpng_write_info) (void*, void*); static void (*qpng_write_row) (void*, unsigned char*); static void (*qpng_write_end) (void*, void*); -static qpng_jmpbuf_t (*qpng_jmpbuf) (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[] = { @@ -115,12 +112,17 @@ static dllfunction_t pngfuncs[] = {"png_write_info", (void **) &qpng_write_info}, {"png_write_row", (void **) &qpng_write_row}, {"png_write_end", (void **) &qpng_write_end}, - {"png_jmpbuf", (void **) &qpng_jmpbuf}, + {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; /* @@ -143,16 +145,20 @@ 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) + "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", @@ -166,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; } @@ -179,6 +193,7 @@ Unload the PNG DLL */ void PNG_CloseLibrary (void) { + Sys_UnloadLibrary (&png14_dll); Sys_UnloadLibrary (&png_dll); } @@ -193,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 @@ -238,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; @@ -267,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; @@ -297,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) @@ -476,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) @@ -494,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);