zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix building against libpng 1.6, which removed png_sizeof

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3687 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2013-04-16 22:37:19 +00:00
parent e2c05cbbae
commit 95ccd3ad7c
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
polymer/eduke32/build/src/engine.c
View file

@ -8,6 +8,9 @@
#define ENGINE #define ENGINE
#if (PNG_LIBPNG_VER > 10599)
# include <string.h>
#endif
#include "compat.h" #include "compat.h"
#include "build.h" #include "build.h"
#include "pragmas.h" #include "pragmas.h"
@ -16311,7 +16314,11 @@ static int32_t screencapture_png(const char *filename, char inverseit, const cha
png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE, PNG_FILTER_VALUE_NONE); png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE, PNG_FILTER_VALUE_NONE);
if (!HICOLOR) if (!HICOLOR)
#if (PNG_LIBPNG_VER > 10599)
palette = (png_colorp)png_malloc(png_ptr, 256*sizeof(png_color));
#else
palette = (png_colorp)png_malloc(png_ptr, 256*png_sizeof(png_color)); palette = (png_colorp)png_malloc(png_ptr, 256*png_sizeof(png_color));
#endif
if (palette) if (palette)
{ {
@ -16328,7 +16335,11 @@ static int32_t screencapture_png(const char *filename, char inverseit, const cha
// png_set_gAMA(png_ptr, info_ptr, vid_gamma); // 1.0/vid_gamma ? // png_set_gAMA(png_ptr, info_ptr, vid_gamma); // 1.0/vid_gamma ?
// png_set_sRGB(png_ptr, info_ptr, PNG_sRGB_INTENT_SATURATION); // hm... // png_set_sRGB(png_ptr, info_ptr, PNG_sRGB_INTENT_SATURATION); // hm...
#if (PNG_LIBPNG_VER > 10599)
text = (png_textp)png_malloc(png_ptr, 2*sizeof(png_text));
#else
text = (png_textp)png_malloc(png_ptr, 2*png_sizeof(png_text)); text = (png_textp)png_malloc(png_ptr, 2*png_sizeof(png_text));
#endif
text[0].compression = PNG_TEXT_COMPRESSION_NONE; text[0].compression = PNG_TEXT_COMPRESSION_NONE;
text[0].key = "Title"; text[0].key = "Title";
text[0].text = (png_charp)(editstatus ? "Mapster32 screenshot" : "EDuke32 screenshot"); text[0].text = (png_charp)(editstatus ? "Mapster32 screenshot" : "EDuke32 screenshot");