README: Remove Discord invite link. The Discord server is now deprecated

[xonotic/darkplaces.git] / image_png.c

diff --git a/image_png.c b/image_png.c
index da327de29c22f2361be6ad2afad5cef70b002130..6b226af060d7f4f1eb85276a1ca3f8b08216757c 100644 (file)
--- a/image_png.c
+++ b/image_png.c
@@ -26,7 +26,7 @@
 //
 //LadyHavoc: rewrote most of this.
 
-#include "quakedef.h"
+#include "darkplaces.h"
 #include "image.h"
 #include "image_png.h"
 
@@ -140,7 +140,7 @@ PNG_OpenLibrary
 Try to load the PNG DLL
 ====================
 */
-qboolean PNG_OpenLibrary (void)
+qbool PNG_OpenLibrary (void)
 {
        const char* dllnames [] =
        {
@@ -172,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;
@@ -193,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);
 }
 
 /*
@@ -474,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;
@@ -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);