mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-29 03:33:48 +00:00
Code Issues Releases Wiki Activity

warning fix + cleanup, no functional changes

Browse source
This commit is contained in:
fgenesis 2016-09-26 01:54:30 +02:00
parent cd24278bf8
commit 8f524279b3
2 changed files with 24 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
ExternalLibs/glpng.h
View file

@ -31,24 +31,6 @@
extern "C" { extern "C" {
#endif #endif
/*
#ifdef _MSC_VER
#ifdef _DEBUG
#pragma comment (lib, "glpngd.lib")
#else
#pragma comment (lib, "glpng.lib")
#endif
#endif
*/
/* XXX This is from Win32's <windef.h> */
#ifndef APIENTRY
#if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED)
#define APIENTRY __stdcall
#else
#define APIENTRY
#endif
#endif
/* Mipmapping parameters */ /* Mipmapping parameters */
#define PNG_NOMIPMAPS 0 /* No mipmapping */ #define PNG_NOMIPMAPS 0 /* No mipmapping */
@ -93,21 +75,21 @@ typedef struct {
unsigned char *Palette; unsigned char *Palette;
} pngRawInfo; } pngRawInfo;
extern int APIENTRY pngLoadRaw(const char *filename, pngRawInfo *rawinfo); int pngLoadRaw(const char *filename, pngRawInfo *rawinfo);
extern int APIENTRY pngLoadRawF(FILE *file, pngRawInfo *rawinfo); int pngLoadRawF(FILE *file, pngRawInfo *rawinfo);
extern int APIENTRY pngLoad(const char *filename, int mipmap, int trans, pngInfo *info); int pngLoad(const char *filename, int mipmap, int trans, pngInfo *info);
extern int APIENTRY pngLoadF(FILE *file, int mipmap, int trans, pngInfo *info); int pngLoadF(FILE *file, int mipmap, int trans, pngInfo *info);
extern int APIENTRY pngLoadMem(const char *mem, int size, int mipmap, int trans, pngInfo *info); int pngLoadMem(const char *mem, int size, int mipmap, int trans, pngInfo *info);
extern unsigned int APIENTRY pngBind(const char *filename, int mipmap, int trans, pngInfo *info, int wrapst, int minfilter, int magfilter); unsigned int pngBind(const char *filename, int mipmap, int trans, pngInfo *info, int wrapst, int minfilter, int magfilter);
extern unsigned int APIENTRY pngBindF(FILE *file, int mipmap, int trans, pngInfo *info, int wrapst, int minfilter, int magfilter); unsigned int pngBindF(FILE *file, int mipmap, int trans, pngInfo *info, int wrapst, int minfilter, int magfilter);
extern unsigned int APIENTRY pngBindMem(const char *mem, int size, int mipmap, int trans, pngInfo *info, int wrapst, int minfilter, int magfilter); unsigned int pngBindMem(const char *mem, int size, int mipmap, int trans, pngInfo *info, int wrapst, int minfilter, int magfilter);
extern void APIENTRY pngSetStencil(unsigned char red, unsigned char green, unsigned char blue); void pngSetStencil(unsigned char red, unsigned char green, unsigned char blue);
extern void APIENTRY pngSetAlphaCallback(unsigned char (*callback)(unsigned char red, unsigned char green, unsigned char blue)); void pngSetAlphaCallback(unsigned char (*callback)(unsigned char red, unsigned char green, unsigned char blue));
extern void APIENTRY pngSetViewingGamma(double viewingGamma); void pngSetViewingGamma(double viewingGamma);
extern void APIENTRY pngSetStandardOrientation(int standardorientation); void pngSetStandardOrientation(int standardorientation);
#ifdef __cplusplus #ifdef __cplusplus
} }

24
ExternalLibs/glpng/glpng.c
View file

@ -277,7 +277,7 @@ genmip:
free(d); free(d);
} }
int APIENTRY pngLoadRaw(const char *filename, pngRawInfo *pinfo) { int pngLoadRaw(const char *filename, pngRawInfo *pinfo) {
int result; int result;
FILE *fp = fopen(filename, "rb"); FILE *fp = fopen(filename, "rb");
if (fp == NULL) return 0; if (fp == NULL) return 0;
@ -295,7 +295,7 @@ int APIENTRY pngLoadRaw(const char *filename, pngRawInfo *pinfo) {
return result; return result;
} }
int APIENTRY pngLoadRawF(FILE *fp, pngRawInfo *pinfo) { int pngLoadRawF(FILE *fp, pngRawInfo *pinfo) {
unsigned char header[8]; unsigned char header[8];
png_structp png; png_structp png;
png_infop info; png_infop info;
@ -694,7 +694,7 @@ finish:
return ret; return ret;
} }
int APIENTRY pngLoad(const char *filename, int mipmap, int trans, pngInfo *pinfo) { int pngLoad(const char *filename, int mipmap, int trans, pngInfo *pinfo) {
int result; int result;
FILE *fp = fopen(filename, "rb"); FILE *fp = fopen(filename, "rb");
if (fp == NULL) return 0; if (fp == NULL) return 0;
@ -706,7 +706,7 @@ int APIENTRY pngLoad(const char *filename, int mipmap, int trans, pngInfo *pinfo
return result; return result;
} }
int APIENTRY pngLoadF(FILE *fp, int mipmap, int trans, pngInfo *pinfo) { int pngLoadF(FILE *fp, int mipmap, int trans, pngInfo *pinfo) {
unsigned char header[8]; unsigned char header[8];
png_structp png; png_structp png;
png_infop info; png_infop info;
@ -744,7 +744,7 @@ static void glpng_read_mem(png_structp png, png_bytep dst, png_size_t size) {
mr->rpos += size; mr->rpos += size;
} }
int APIENTRY pngLoadMem(const char *mem, int size, int mipmap, int trans, pngInfo *pinfo) { int pngLoadMem(const char *mem, int size, int mipmap, int trans, pngInfo *pinfo) {
unsigned char header[8]; unsigned char header[8];
png_structp png; png_structp png;
png_infop info; png_infop info;
@ -792,7 +792,7 @@ static unsigned int SetParams(int wrapst, int magfilter, int minfilter) {
return id; return id;
} }
unsigned int APIENTRY pngBind(const char *filename, int mipmap, int trans, pngInfo *info, int wrapst, int minfilter, int magfilter) { unsigned int pngBind(const char *filename, int mipmap, int trans, pngInfo *info, int wrapst, int minfilter, int magfilter) {
unsigned int id = SetParams(wrapst, magfilter, minfilter); unsigned int id = SetParams(wrapst, magfilter, minfilter);
if (id != 0 && pngLoad(filename, mipmap, trans, info)) if (id != 0 && pngLoad(filename, mipmap, trans, info))
@ -800,7 +800,7 @@ unsigned int APIENTRY pngBind(const char *filename, int mipmap, int trans, pngIn
return 0; return 0;
} }
unsigned int APIENTRY pngBindF(FILE *file, int mipmap, int trans, pngInfo *info, int wrapst, int minfilter, int magfilter) { unsigned int pngBindF(FILE *file, int mipmap, int trans, pngInfo *info, int wrapst, int minfilter, int magfilter) {
unsigned int id = SetParams(wrapst, magfilter, minfilter); unsigned int id = SetParams(wrapst, magfilter, minfilter);
if (id != 0 && pngLoadF(file, mipmap, trans, info)) if (id != 0 && pngLoadF(file, mipmap, trans, info))
@ -808,7 +808,7 @@ unsigned int APIENTRY pngBindF(FILE *file, int mipmap, int trans, pngInfo *info,
return 0; return 0;
} }
unsigned int APIENTRY pngBindMem(const char *mem, int size, int mipmap, int trans, pngInfo *info, int wrapst, int minfilter, int magfilter) { unsigned int pngBindMem(const char *mem, int size, int mipmap, int trans, pngInfo *info, int wrapst, int minfilter, int magfilter) {
unsigned int id = SetParams(wrapst, magfilter, minfilter); unsigned int id = SetParams(wrapst, magfilter, minfilter);
if (id != 0 && pngLoadMem(mem, size, mipmap, trans, info)) if (id != 0 && pngLoadMem(mem, size, mipmap, trans, info))
@ -816,18 +816,18 @@ unsigned int APIENTRY pngBindMem(const char *mem, int size, int mipmap, int tran
return 0; return 0;
} }
void APIENTRY pngSetStencil(unsigned char red, unsigned char green, unsigned char blue) { void pngSetStencil(unsigned char red, unsigned char green, unsigned char blue) {
StencilRed = red, StencilGreen = green, StencilBlue = blue; StencilRed = red, StencilGreen = green, StencilBlue = blue;
} }
void APIENTRY pngSetAlphaCallback(unsigned char (*callback)(unsigned char red, unsigned char green, unsigned char blue)) { void pngSetAlphaCallback(unsigned char (*callback)(unsigned char red, unsigned char green, unsigned char blue)) {
if (callback == NULL) if (callback == NULL)
AlphaCallback = DefaultAlphaCallback; AlphaCallback = DefaultAlphaCallback;
else else
AlphaCallback = callback; AlphaCallback = callback;
} }
void APIENTRY pngSetViewingGamma(double viewingGamma) { void pngSetViewingGamma(double viewingGamma) {
if(viewingGamma > 0) { if(viewingGamma > 0) {
gammaExplicit = 1; gammaExplicit = 1;
screenGamma = 2.2/viewingGamma; screenGamma = 2.2/viewingGamma;
@ -838,6 +838,6 @@ void APIENTRY pngSetViewingGamma(double viewingGamma) {
} }
} }
void APIENTRY pngSetStandardOrientation(int standardorientation) { void pngSetStandardOrientation(int standardorientation) {
StandardOrientation = standardorientation; StandardOrientation = standardorientation;
} }