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

See if this silences MSVC2019...

Browse Source
This commit is contained in:
Martin Tůma 2021-01-10 15:42:29 +01:00
parent 1468528a62
commit ae1e357fb7
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/IMG/img.cpp
View File

@ -203,7 +203,7 @@ bool IMG::readBlock(int blockNum, char *data)
{ {
if (!_file.seek((quint64)blockNum << _blockBits)) if (!_file.seek((quint64)blockNum << _blockBits))
return false; return false;
if (read(data, (qint64)(1U<<_blockBits)) < (qint64)(1U<<_blockBits)) if (read(data, 1ULL<<_blockBits) < (qint64)(1ULL<<_blockBits))
return false; return false;
return true; return true;

7
src/map/IMG/nodfile.cpp
View File

@ -29,8 +29,9 @@ static bool adjDistInfo(BitStream1 &bs, bool extraBit, bool &eog)
if (!bs.read((int)extraBit | 8, data)) if (!bs.read((int)extraBit | 8, data))
return false; return false;
if (!extraBit)
data <<= 1;
data <<= !(int)extraBit;
eog |= (quint8)data & 1; eog |= (quint8)data & 1;
data >>= 1; data >>= 1;
@ -50,8 +51,8 @@ static bool adjNodeInfo(BitStream1 &bs, bool extraBit, NodeOffset &offset)
if (!bs.read(9, data)) if (!bs.read(9, data))
return false; return false;
if (!extraBit)
data <<= !(int)extraBit; data <<= 1;
if (data & 1) { if (data & 1) {
offset.ext = true; offset.ext = true;