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

Use QVectors instead of plain arrays

Browse Source
This commit is contained in:
Martin Tůma 2024-04-16 10:26:17 +02:00
parent 031d82f689
commit a0ce50e7e4
2 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/map/IMG/lblfile.cpp
View File

@ -78,8 +78,6 @@ static QByteArray ft2m(const QByteArray &str)
LBLFile::~LBLFile() LBLFile::~LBLFile()
{ {
delete _huffmanText; delete _huffmanText;
delete[] _table;
delete[] _rasters;
} }
bool LBLFile::load(Handle &hdl, const RGNFile *rgn, Handle &rgnHdl) bool LBLFile::load(Handle &hdl, const RGNFile *rgn, Handle &rgnHdl)
@ -103,10 +101,10 @@ bool LBLFile::load(Handle &hdl, const RGNFile *rgn, Handle &rgnHdl)
return false; return false;
if (size && recordSize) { if (size && recordSize) {
_table = new quint32[size / recordSize]; _table.resize(size / recordSize);
if (!seek(hdl, offset)) if (!seek(hdl, offset))
return false; return false;
for (quint32 i = 0; i < size / recordSize; i++) { for (quint32 i = 0; i < _table.size(); i++) {
if (!readVUInt32(hdl, recordSize, _table[i])) if (!readVUInt32(hdl, recordSize, _table[i]))
return false; return false;
} }
@ -139,12 +137,10 @@ bool LBLFile::load(Handle &hdl, const RGNFile *rgn, Handle &rgnHdl)
void LBLFile::clear() void LBLFile::clear()
{ {
_table = QVector<quint32>();
_rasters = QVector<Image>();
delete _huffmanText; delete _huffmanText;
delete[] _table;
delete[] _rasters;
_huffmanText = 0; _huffmanText = 0;
_table = 0;
_rasters = 0;
} }
Label LBLFile::str2label(const QVector<quint8> &str, bool capitalize, Label LBLFile::str2label(const QVector<quint8> &str, bool capitalize,
@ -280,13 +276,15 @@ Label LBLFile::labelHuffman(Handle &hdl, const SubFile *file, Handle &fileHdl,
if (!_huffmanText->decode(file, fileHdl, size, str)) if (!_huffmanText->decode(file, fileHdl, size, str))
return Label(); return Label();
if (!_table) if (!_table.size())
return str2label(str, capitalize, convert); return str2label(str, capitalize, convert);
QVector<quint8> str2; QVector<quint8> str2;
for (int i = 0; i < str.size(); i++) { for (int i = 0; i < str.size(); i++) {
quint32 val = _table[str.at(i)]; quint8 c(str.at(i));
quint32 val = (c < _table.size()) ? _table.at(c) : 0;
if (val) { if (val) {
quint32 off = _base.offset + ((val & 0x7fffff) << _shift); quint32 off = _base.offset + ((val & 0x7fffff) << _shift);
if (!seek(hdl, off)) if (!seek(hdl, off))
@ -301,13 +299,13 @@ Label LBLFile::labelHuffman(Handle &hdl, const SubFile *file, Handle &fileHdl,
str2)) str2))
return Label(); return Label();
} else { } else {
if (str.at(i) == 7) { if (c == 7) {
str2.append(0); str2.append(0);
break; break;
} }
if (str2.size() && str2.back() == '\0') if (str2.size() && str2.back() == '\0')
str2[str2.size() - 1] = ' '; str2[str2.size() - 1] = ' ';
str2.append(str.at(i)); str2.append(c);
} }
} }
@ -357,15 +355,15 @@ bool LBLFile::loadRasterTable(Handle &hdl, quint32 offset, quint32 size,
quint32 recordSize) quint32 recordSize)
{ {
quint32 prev, cur; quint32 prev, cur;
quint32 imgCount = size / recordSize;
_imgCount = size / recordSize; _imgIdSize = byteSize(imgCount - 1);
_imgIdSize = byteSize(_imgCount - 1); _rasters.resize(imgCount);
_rasters = new Image[_imgCount];
if (!(seek(hdl, offset) && readVUInt32(hdl, recordSize, prev))) if (!(seek(hdl, offset) && readVUInt32(hdl, recordSize, prev)))
return false; return false;
for (quint32 i = 1; i < _imgCount; i++) { for (quint32 i = 1; i < imgCount; i++) {
if (!readVUInt32(hdl, recordSize, cur)) if (!readVUInt32(hdl, recordSize, cur))
return false; return false;
@ -375,8 +373,8 @@ bool LBLFile::loadRasterTable(Handle &hdl, quint32 offset, quint32 size,
prev = cur; prev = cur;
} }
_rasters[_imgCount-1].offset = prev; _rasters[imgCount-1].offset = prev;
_rasters[_imgCount-1].size = _img.size - prev; _rasters[imgCount-1].size = _img.size - prev;
return true; return true;
} }
@ -385,14 +383,14 @@ QPixmap LBLFile::image(Handle &hdl, quint32 id) const
{ {
QPixmap pm; QPixmap pm;
if (id >= _imgCount) if (id >= _rasters.size())
return pm; return pm;
if (!seek(hdl, _img.offset + _rasters[id].offset)) if (!seek(hdl, _img.offset + _rasters.at(id).offset))
return pm; return pm;
QByteArray ba; QByteArray ba;
ba.resize(_rasters[id].size); ba.resize(_rasters.at(id).size);
if (!read(hdl, ba.data(), _rasters[id].size)) if (!read(hdl, ba.data(), ba.size()))
return pm; return pm;
pm.loadFromData(ba, "jpeg"); pm.loadFromData(ba, "jpeg");

17
src/map/IMG/lblfile.h
View File

@ -16,14 +16,14 @@ class LBLFile : public SubFile
{ {
public: public:
LBLFile(const IMGData *img) LBLFile(const IMGData *img)
: SubFile(img), _huffmanText(0), _table(0), _rasters(0), _imgIdSize(0), : SubFile(img), _huffmanText(0), _imgIdSize(0), _poiShift(0), _shift(0),
_poiShift(0), _shift(0), _encoding(0) {} _encoding(0) {}
LBLFile(const QString *path) LBLFile(const QString *path)
: SubFile(path), _huffmanText(0), _table(0), _rasters(0), _imgIdSize(0), : SubFile(path), _huffmanText(0), _imgIdSize(0), _poiShift(0), _shift(0),
_poiShift(0), _shift(0), _encoding(0) {} _encoding(0) {}
LBLFile(const SubFile *gmp, quint32 offset) LBLFile(const SubFile *gmp, quint32 offset)
: SubFile(gmp, offset), _huffmanText(0), _table(0), _rasters(0), : SubFile(gmp, offset), _huffmanText(0), _imgIdSize(0), _poiShift(0),
_imgIdSize(0), _poiShift(0), _shift(0), _encoding(0) {} _shift(0), _encoding(0) {}
~LBLFile(); ~LBLFile();
bool load(Handle &hdl, const RGNFile *rgn, Handle &rgnHdl); bool load(Handle &hdl, const RGNFile *rgn, Handle &rgnHdl);
@ -55,11 +55,10 @@ private:
quint32 recordSize); quint32 recordSize);
HuffmanText *_huffmanText; HuffmanText *_huffmanText;
quint32 *_table; QVector<Image> _rasters;
Image *_rasters; QVector<quint32> _table;
TextCodec _codec; TextCodec _codec;
Section _base, _poi, _img; Section _base, _poi, _img;
quint32 _imgCount;
quint8 _imgIdSize; quint8 _imgIdSize;
quint8 _poiShift; quint8 _poiShift;
quint8 _shift; quint8 _shift;