thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Inflate only size out bytes

Browse source 
Saves time uncompressing an entire lump when only part of
it is needed.
This commit is contained in:
James R 2021-12-15 14:01:40 -08:00
parent 152f4224d9
commit de2eab5e7a
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/w_wad.c
View file

@ -1480,10 +1480,10 @@ size_t W_ReadLumpHeaderPwad(UINT16 wad, UINT16 lump, void *dest, size_t size, si
int zErr; // Helper var. int zErr; // Helper var.
z_stream strm; z_stream strm;
unsigned long rawSize = l->disksize; unsigned long rawSize = l->disksize;
unsigned long decSize = l->size; unsigned long decSize = size;
rawData = Z_Malloc(rawSize, PU_STATIC, NULL); rawData = Z_Malloc(rawSize, PU_STATIC, NULL);
decData = Z_Malloc(decSize, PU_STATIC, NULL); decData = dest;
if (fread(rawData, 1, rawSize, handle) < rawSize) if (fread(rawData, 1, rawSize, handle) < rawSize)
I_Error("wad %d, lump %d: cannot read compressed data", wad, lump); I_Error("wad %d, lump %d: cannot read compressed data", wad, lump);
@ -1501,12 +1501,8 @@ size_t W_ReadLumpHeaderPwad(UINT16 wad, UINT16 lump, void *dest, size_t size, si
zErr = inflateInit2(&strm, -15); zErr = inflateInit2(&strm, -15);
if (zErr == Z_OK) if (zErr == Z_OK)
{ {
zErr = inflate(&strm, Z_FINISH); zErr = inflate(&strm, Z_SYNC_FLUSH);
if (zErr == Z_STREAM_END) if (zErr != Z_OK && zErr != Z_STREAM_END)
{
M_Memcpy(dest, decData, size);
}
else
{ {
size = 0; size = 0;
zerr(zErr); zerr(zErr);
@ -1520,7 +1516,6 @@ size_t W_ReadLumpHeaderPwad(UINT16 wad, UINT16 lump, void *dest, size_t size, si
} }
Z_Free(rawData); Z_Free(rawData);
Z_Free(decData);
#ifdef NO_PNG_LUMPS #ifdef NO_PNG_LUMPS
if (Picture_IsLumpPNG((UINT8 *)dest, size)) if (Picture_IsLumpPNG((UINT8 *)dest, size))