zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-15 12:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

- must reset file pointer before reading the size from a patch texture.

Browse source
This commit is contained in:
Christoph Oelckers 2020-09-26 07:54:00 +02:00
parent 40a89fb26f
commit 8450369a22
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/common/textures/formats/patchtexture.cpp
View file

@ -127,6 +127,7 @@ FImageSource *PatchImage_TryCreate(FileReader & file, int lumpnum)
{ {
bool isalpha; bool isalpha;
file.Seek(0, FileReader::SeekSet);
int width = file.ReadUInt16(); int width = file.ReadUInt16();
int height = file.ReadUInt16(); int height = file.ReadUInt16();
int leftoffset = file.ReadInt16(); int leftoffset = file.ReadInt16();
@ -134,7 +135,6 @@ FImageSource *PatchImage_TryCreate(FileReader & file, int lumpnum)
// quickly reject any lump which cannot be a texture without reading in all the data. // quickly reject any lump which cannot be a texture without reading in all the data.
if (height > 0 && height <= 2048 && width > 0 && width <= 2048 && width < file.GetLength() / 4 && abs(leftoffset) < 4096 && abs(topoffset) < 4096) if (height > 0 && height <= 2048 && width > 0 && width <= 2048 && width < file.GetLength() / 4 && abs(leftoffset) < 4096 && abs(topoffset) < 4096)
{ {
file.Seek(0, FileReader::SeekSet);
if (!CheckIfPatch(file, isalpha)) return NULL; if (!CheckIfPatch(file, isalpha)) return NULL;
file.Seek(8, FileReader::SeekSet); file.Seek(8, FileReader::SeekSet);
return new FPatchTexture(lumpnum, width, height, leftoffset, topoffset, isalpha); return new FPatchTexture(lumpnum, width, height, leftoffset, topoffset, isalpha);