root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-30 22:51:16 +01:00
Code Issues Projects Releases Activity

Code cleanup

Browse Source
This commit is contained in:
Martin Tůma 2024-04-18 20:35:05 +02:00
parent a0ce50e7e4
commit 089ccfde71
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,44 +272,41 @@ Label LBLFile::label8b(const SubFile *file, Handle &fileHdl, quint32 size,
Label LBLFile::labelHuffman(Handle &hdl, const SubFile *file, Handle &fileHdl, Label LBLFile::labelHuffman(Handle &hdl, const SubFile *file, Handle &fileHdl,
quint32 size, bool capitalize, bool convert) quint32 size, bool capitalize, bool convert)
{ {
QVector<quint8> str; QVector<quint8> tpl;
if (!_huffmanText->decode(file, fileHdl, size, str)) if (!_huffmanText->decode(file, fileHdl, size, tpl))
return Label(); return Label();
if (!_table.size()) if (!_table.size())
return str2label(str, capitalize, convert); return str2label(tpl, capitalize, convert);
QVector<quint8> str2; QVector<quint8> str;
for (int i = 0; i < str.size(); i++) {
quint8 c(str.at(i)); for (int i = 0; i < tpl.size(); i++) {
quint8 c(tpl.at(i));
quint32 val = (c < _table.size()) ? _table.at(c) : 0; quint32 val = (c < _table.size()) ? _table.at(c) : 0;
if (val) { if (val) {
quint32 off = _base.offset + ((val & 0x7fffff) << _shift); if (str.size() && str.back() == '\0')
if (!seek(hdl, off)) str.back() = ' ';
else if (str.size())
str.append(' ');
quint32 offset = _base.offset + ((val & 0x7fffff) << _shift);
quint32 limit = _base.offset + _base.size - offset;
if (!seek(hdl, offset))
return Label(); return Label();
if (!_huffmanText->decode(this, hdl, limit, str))
if (str2.size() && str2.back() == '\0')
str2[str2.size() - 1] = ' ';
else if (str2.size())
str2.append(' ');
if (!_huffmanText->decode(this, hdl, _base.offset + _base.size - off,
str2))
return Label(); return Label();
} else { } else {
if (c == 7) { if (str.size() && str.back() == '\0')
str2.append(0); str.back() = ' ';
break;
} str.append(c);
if (str2.size() && str2.back() == '\0')
str2[str2.size() - 1] = ' ';
str2.append(c);
} }
} }
return str2label(str2, capitalize, convert); return str2label(str, capitalize, convert);
} }
Label LBLFile::label(Handle &hdl, quint32 offset, bool poi, bool capitalize, Label LBLFile::label(Handle &hdl, quint32 offset, bool poi, bool capitalize,