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

Code cleanup/optimization

Browse Source
This commit is contained in:
Martin Tůma 2022-02-05 12:37:14 +01:00
parent da763e7700
commit 21b258809d
4 changed files with 57 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/map/IMG/bitstream.cpp
View File

@ -1,5 +1,6 @@
#include "bitstream.h" #include "bitstream.h"
using namespace Garmin;
using namespace IMG; using namespace IMG;
bool BitStream1::flush() bool BitStream1::flush()
@ -22,7 +23,7 @@ bool BitStream1::readUInt24(quint32 &val)
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
if (!read(8, b)) if (!read(8, b))
return false; return false;
val |= (b << (i * 8)); val |= (b << (i << 3));
} }
return true; return true;
@ -43,22 +44,22 @@ bool BitStream4F::flush()
bool BitStream4F::read(quint32 bits, quint32 &val) bool BitStream4F::read(quint32 bits, quint32 &val)
{ {
if (bits <= 32 - (_used + _unused)) { if (bits <= available()) {
val = bits ? (_data << _used) >> (32 - bits) : 0; val = bits ? (_data << _used) >> (32U - bits) : 0;
_used += bits; _used += bits;
return true; return true;
} }
Q_ASSERT(_length && !_unused); Q_ASSERT(_length && !_unused);
quint32 old = (_used < 32) ? (_data << _used) >> (32 - bits) : 0; quint32 old = (_used < 32U) ? (_data << _used) >> (32U - bits) : 0;
quint32 bytes = qMin(_length, 4U); quint32 bytes = qMin(_length, 4U);
if (!_file.readVUInt32SW(_hdl, bytes, _data)) if (!_file.readVUInt32SW(_hdl, bytes, _data))
return false; return false;
_used -= 32 - bits; _used -= 32U - bits;
_length -= bytes; _length -= bytes;
_unused = (4 - bytes) * 8; _unused = (4U - bytes) << 3;
_data <<= _unused; _data <<= _unused;
val = _data >> (32 - _used) | old; val = _data >> (32 - _used) | old;
@ -74,31 +75,35 @@ BitStream4R::BitStream4R(const SubFile &file, SubFile::Handle &hdl,
bool BitStream4R::readBytes(quint32 bytes, quint32 &val) bool BitStream4R::readBytes(quint32 bytes, quint32 &val)
{ {
quint32 bits = _used % 8;
quint32 b; quint32 b;
if (bits) {
if (!read(8 - bits, b))
return false;
Q_ASSERT(!b);
}
val = 0; val = 0;
for (quint32 i = 0; i < bytes; i++) { for (quint32 i = 0; i < bytes; i++) {
if (!read(8, b)) if (!read(8, b))
return false; return false;
val |= (b << (i * 8)); val |= (b << (i << 3));
} }
return true; return true;
} }
bool BitStream4R::readBytesAligned(quint32 bytes, quint32 &val)
{
quint32 bits = _used & 7U;
quint32 b;
if (bits && !read(8U - bits, b))
return false;
return readBytes(bytes, val);
}
bool BitStream4R::readVUInt32(quint32 &val) bool BitStream4R::readVUInt32(quint32 &val)
{ {
quint32 b; quint32 b;
quint8 bytes, shift; quint8 bytes, shift;
if (!readBytes(1, b)) if (!readBytesAligned(1, b))
return false; return false;
if ((b & 1) == 0) { if ((b & 1) == 0) {
@ -125,11 +130,11 @@ bool BitStream4R::readVUInt32(quint32 &val)
return true; return true;
} }
bool BitStream4R::readVuint32SM(quint32 &val1, quint32 &val2, quint32 &val2Bits) bool BitStream4R::readVUint32SM(quint32 &val1, quint32 &val2, quint32 &val2Bits)
{ {
quint32 b, eb; quint32 b, eb;
if (!readBytes(1, b)) if (!readBytesAligned(1, b))
return false; return false;
if (!(b & 1)) { if (!(b & 1)) {
@ -154,15 +159,16 @@ bool BitStream4R::readVuint32SM(quint32 &val1, quint32 &val2, quint32 &val2Bits)
bool BitStream4R::skip(quint32 bytes) bool BitStream4R::skip(quint32 bytes)
{ {
if (bytes * 8 > bitsAvailable()) quint32 ab = available() >> 3;
if (bytes <= ab)
_used += bytes << 3;
else {
if (bytes > ab + _length)
return false; return false;
quint32 ab = (32 - (_used + _unused))/8; quint32 seek = (bytes - ab) & 0xFFFFFFFC;
if (bytes <= ab) quint32 read = (bytes - ab) & 3U;
_used += bytes * 8;
else {
quint32 seek = ((bytes - ab)/4)*4;
quint32 read = (bytes - ab)%4;
if (seek && !_file.seek(_hdl, _file.pos(_hdl) - seek)) if (seek && !_file.seek(_hdl, _file.pos(_hdl) - seek))
return false; return false;
_length -= seek; _length -= seek;
@ -170,13 +176,13 @@ bool BitStream4R::skip(quint32 bytes)
quint32 rb = qMin(_length, 4U); quint32 rb = qMin(_length, 4U);
if (!_file.readUInt32(_hdl, _data)) if (!_file.readUInt32(_hdl, _data))
return false; return false;
if (!_file.seek(_hdl, _file.pos(_hdl) - 8)) if (!_file.seek(_hdl, _file.pos(_hdl) - 8U))
return false; return false;
_length -= rb; _length -= rb;
_unused = (4 - rb) * 8; _unused = (4U - rb) << 3;
_used = read * 8; _used = read << 3;
} else } else
_used = 32; _used = 32U;
} }
return true; return true;
@ -184,13 +190,13 @@ bool BitStream4R::skip(quint32 bytes)
void BitStream4R::resize(quint32 bytes) void BitStream4R::resize(quint32 bytes)
{ {
quint32 ab = (32 - (_used + _unused) + 7)/8; quint32 ab = bs(available());
if (ab <= bytes) if (ab <= bytes)
_length = bytes - ab; _length = bytes - ab;
else { else {
_length = 0; _length = 0;
_unused += (ab - bytes) * 8; _unused += (ab - bytes) << 3;
} }
} }

25
src/map/IMG/bitstream.h
View File

@ -30,9 +30,11 @@ public:
_data(0) {} _data(0) {}
quint64 bitsAvailable() const quint64 bitsAvailable() const
{return (quint64)_length * 8 + (32 - _used) - _unused;} {return ((quint64)_length << 3) + available();}
protected: protected:
quint32 available() const {return 32U - (_used + _unused);}
const SubFile &_file; const SubFile &_file;
SubFile::Handle &_hdl; SubFile::Handle &_hdl;
quint32 _length, _used, _unused; quint32 _length, _used, _unused;
@ -61,14 +63,17 @@ public:
BitStream4R(const SubFile &file, SubFile::Handle &hdl, quint32 length); BitStream4R(const SubFile &file, SubFile::Handle &hdl, quint32 length);
template<typename T> bool read(quint32 bits, T &val); template<typename T> bool read(quint32 bits, T &val);
bool readBytes(quint32 bytes, quint32 &val);
bool readVUInt32(quint32 &val); bool readVUInt32(quint32 &val);
bool readVuint32SM(quint32 &val1, quint32 &val2, quint32 &val2Bits); bool readVUint32SM(quint32 &val1, quint32 &val2, quint32 &val2Bits);
bool skip(quint32 bytes); bool skip(quint32 bytes);
void resize(quint32 bytes); void resize(quint32 bytes);
void save(State &state); void save(State &state);
bool restore(const State &state); bool restore(const State &state);
private:
bool readBytes(quint32 bytes, quint32 &val);
bool readBytesAligned(quint32 bytes, quint32 &val);
}; };
@ -105,26 +110,26 @@ bool BitStream1::read(quint32 bits, T &val)
template<typename T> template<typename T>
bool BitStream4R::read(quint32 bits, T &val) bool BitStream4R::read(quint32 bits, T &val)
{ {
if (bits <= 32 - (_used + _unused)) { if (bits <= available()) {
val = bits ? (_data << _used) >> (32 - bits) : 0; val = bits ? (_data << _used) >> (32U - bits) : 0;
_used += bits; _used += bits;
return true; return true;
} }
Q_ASSERT(_length && !_unused); Q_ASSERT(_length && !_unused);
quint32 old = (_used < 32) ? (_data << _used) >> (32 - bits) : 0; quint32 old = (_used < 32U) ? (_data << _used) >> (32U - bits) : 0;
quint32 bytes = qMin(_length, 4U); quint32 bytes = qMin(_length, 4U);
if (!_file.readUInt32(_hdl, _data)) if (!_file.readUInt32(_hdl, _data))
return false; return false;
if (!_file.seek(_hdl, _file.pos(_hdl) - 8)) if (!_file.seek(_hdl, _file.pos(_hdl) - 8U))
return false; return false;
_length -= bytes; _length -= bytes;
_used -= 32 - bits; _used -= 32U - bits;
_unused = (4 - bytes) * 8; _unused = (4U - bytes) << 3;
val = _data >> (32 - _used) | old; val = _data >> (32U - _used) | old;
return true; return true;
} }

2
src/map/IMG/huffmanstream.h
View File

@ -33,7 +33,7 @@ template <class BitStream>
bool HuffmanStream<BitStream>::fetchData() bool HuffmanStream<BitStream>::fetchData()
{ {
quint32 next; quint32 next;
quint8 nextSize = qMin((quint64)(32 - _symbolDataSize), _bs.bitsAvailable()); quint32 nextSize = qMin((quint64)(32 - _symbolDataSize), _bs.bitsAvailable());
if (!_bs.read(nextSize, next)) if (!_bs.read(nextSize, next))
return false; return false;

12
src/map/IMG/netfile.cpp
View File

@ -37,7 +37,7 @@ static bool skipShape(BitStream4R &bs)
{ {
quint32 v1, v2, v2b; quint32 v1, v2, v2b;
if (!bs.readVuint32SM(v1, v2, v2b)) if (!bs.readVUint32SM(v1, v2, v2b))
return false; return false;
return bs.skip(v1); return bs.skip(v1);
@ -64,7 +64,7 @@ static bool seekToLevel(BitStream4R &bs, quint8 level)
quint32 v1, v2, v2b; quint32 v1, v2, v2b;
for (quint8 i = 1; i < level; ) { for (quint8 i = 1; i < level; ) {
if (!bs.readVuint32SM(v1, v2, v2b)) if (!bs.readVUint32SM(v1, v2, v2b))
return false; return false;
if (!bs.skip(v1)) if (!bs.skip(v1))
return false; return false;
@ -83,7 +83,7 @@ static bool seekToLine(BitStream4R &bs, quint8 line)
quint32 v1, v2, v2b; quint32 v1, v2, v2b;
for (quint8 i = 0; i < line; i++) { for (quint8 i = 0; i < line; i++) {
if (!bs.readVuint32SM(v1, v2, v2b)) if (!bs.readVUint32SM(v1, v2, v2b))
return false; return false;
if (!bs.skip(v1)) if (!bs.skip(v1))
return false; return false;
@ -99,7 +99,7 @@ static bool readLine(BitStream4R &bs, const SubDiv *subdiv,
const HuffmanTable *table, MapData::Poly &poly) const HuffmanTable *table, MapData::Poly &poly)
{ {
quint32 v1, v2, v2b; quint32 v1, v2, v2b;
if (!bs.readVuint32SM(v1, v2, v2b)) if (!bs.readVUint32SM(v1, v2, v2b))
return false; return false;
bs.resize(v1); bs.resize(v1);
@ -170,7 +170,7 @@ static bool readShape(const NODFile *nod, SubFile::Handle &nodHdl,
quint16 cnt = 0xFFFF, bool check = false) quint16 cnt = 0xFFFF, bool check = false)
{ {
quint32 v1, v2, v2b; quint32 v1, v2, v2b;
if (!bs.readVuint32SM(v1, v2, v2b)) if (!bs.readVUint32SM(v1, v2, v2b))
return false; return false;
BitStream4R::State state; BitStream4R::State state;
bs.save(state); bs.save(state);
@ -298,7 +298,7 @@ static bool readShape(const NODFile *nod, SubFile::Handle &nodHdl,
if (check && nodes == cnt) { if (check && nodes == cnt) {
if (!(bs.restore(state) && bs.skip(v1) if (!(bs.restore(state) && bs.skip(v1)
&& bs.readVuint32SM(v1, v2, v2b))) && bs.readVUint32SM(v1, v2, v2b)))
return false; return false;
if (5 < v2b) if (5 < v2b)
v2 >>= v2b - 2; v2 >>= v2b - 2;