root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-28 05:34:47 +01:00
Code Issues Projects Releases Activity

Code cleanup

Browse Source
This commit is contained in:
Martin Tůma 2021-10-04 20:03:39 +02:00
parent c364922625
commit 06dac47550
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/map/IMG/trefile.cpp
View File

@ -72,13 +72,12 @@ bool TREFile::init()
// Levels & subdivs info // Levels & subdivs info
quint32 levelsOffset, levelsSize, subdivSize; quint32 levelsOffset, levelsSize, subdivSize;
if (!(seek(hdl, _gmpOffset + 0x21) && readUInt32(hdl, levelsOffset) if (!(readUInt32(hdl, levelsOffset) && readUInt32(hdl, levelsSize)
&& readUInt32(hdl, levelsSize) && readUInt32(hdl, _subdivOffset) && readUInt32(hdl, _subdivOffset) && readUInt32(hdl, subdivSize)))
&& readUInt32(hdl, subdivSize)))
return false; return false;
if (hdrLen > 0x9A) { if (hdrLen > 0x9A) {
// TRE7 info + flags // Extended objects (TRE7) info
if (!(seek(hdl, _gmpOffset + 0x7C) && readUInt32(hdl, _extended.offset) if (!(seek(hdl, _gmpOffset + 0x7C) && readUInt32(hdl, _extended.offset)
&& readUInt32(hdl, _extended.size) && readUInt32(hdl, _extended.size)
&& readUInt16(hdl, _extended.itemSize) && readUInt32(hdl, _flags))) && readUInt16(hdl, _extended.itemSize) && readUInt32(hdl, _flags)))
@ -91,15 +90,15 @@ bool TREFile::init()
} }
// Tile levels // Tile levels
if (levelsSize > 64 || !seek(hdl, levelsOffset))
return false;
quint8 levels[64]; quint8 levels[64];
for (quint32 i = 0; i < levelsSize; i++) if (levelsSize > 64 || !(seek(hdl, levelsOffset)
if (!readByte(hdl, &levels[i])) && read(hdl, (char*)levels, levelsSize)))
return false; return false;
if (locked) { if (locked) {
quint32 key; quint32 key;
if (!seek(hdl, _gmpOffset + 0xAA) || !readUInt32(hdl, key)) if (hdrLen < 0xAE || !(seek(hdl, _gmpOffset + 0xAA)
&& readUInt32(hdl, key)))
return false; return false;
demangle(levels, levelsSize, key); demangle(levels, levelsSize, key);
} }