//
//LadyHavoc: rewrote most of this.
-#include "quakedef.h"
+#include "darkplaces.h"
#include "image.h"
#include "image_png.h"
Try to load the PNG DLL
====================
*/
-qboolean PNG_OpenLibrary (void)
+qbool PNG_OpenLibrary (void)
{
const char* dllnames [] =
{
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;
*/
void PNG_CloseLibrary (void)
{
- Sys_UnloadLibrary (&png14_dll);
- Sys_UnloadLibrary (&png_dll);
+ Sys_FreeLibrary (&png14_dll);
+ Sys_FreeLibrary (&png_dll);
}
/*
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);
}
unsigned char *PNG_LoadImage_BGRA (const unsigned char *raw, int filesize, int *miplevel)
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;
// 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)
#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);