lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove the define.

This commit is contained in:
Steel Titanium 2019-03-15 18:46:25 -04:00
parent 5a170b9e4e
commit 6d751ff302
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/w_wad.c
View File

@ -1182,19 +1182,17 @@ void zerr(int ret)
#define NO_PNG_LUMPS #define NO_PNG_LUMPS
#ifdef NO_PNG_LUMPS #ifdef NO_PNG_LUMPS
static void ErrorIfPNG(void *d, size_t s, char *f, char *l) static void ErrorIfPNG(UINT8 *d, size_t s, char *f, char *l)
{ {
if (s < 67) // http://garethrees.org/2007/11/14/pngcrush/ if (s < 67) // http://garethrees.org/2007/11/14/pngcrush/
return; return;
#define sigcheck ((UINT8 *)d)
// Check for PNG file signature using memcmp // Check for PNG file signature using memcmp
// As it may be faster on CPUs with slow unaligned memory access // As it may be faster on CPUs with slow unaligned memory access
// Ref: http://www.libpng.org/pub/png/spec/1.2/PNG-Rationale.html#R.PNG-file-signature // Ref: http://www.libpng.org/pub/png/spec/1.2/PNG-Rationale.html#R.PNG-file-signature
if (memcmp(&sigcheck[0], "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a", 8) == 0) if (memcmp(&d[0], "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a", 8) == 0)
{ {
I_Error("W_Wad: Lump \"%s\" in file \"%s\" is a .PNG - please convert to either Doom or Flat (raw) image format.", l, f); I_Error("W_Wad: Lump \"%s\" in file \"%s\" is a .PNG - please convert to either Doom or Flat (raw) image format.", l, f);
} }
#undef sigcheck
} }
#endif #endif