Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Sryder13 2014-04-24 15:37:07 +01:00
commit c5aa433167
1 changed files with 2 additions and 1 deletions

View File

@ -77,6 +77,7 @@
#define _FILE_OFFSET_BITS 0
#endif
#include "zlib.h"
#include "png.h"
#if (PNG_LIBPNG_VER_MAJOR > 1) || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4)
#define NO_PNG_DEBUG // 1.4.0 move png_debug to pngpriv.h
@ -688,7 +689,7 @@ static void M_PNGText(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png
else
snprintf(locationtxt, 40, "Unknown");
png_memset(png_infotext,0x00,sizeof (png_infotext));
memset(png_infotext,0x00,sizeof (png_infotext));
for (i = 0; i < SRB2PNGTXT; i++)
png_infotext[i].key = keytxt[i];