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

Fixed/improved header parsing

Browse Source
This commit is contained in:
Martin Tůma 2021-11-15 21:30:57 +01:00
parent 94f03670ef
commit 914b730a21
2 changed files with 64 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/map/qctmap.cpp
View File

@ -2,6 +2,7 @@
#include <QDataStream>
#include <QPixmapCache>
#include <QPainter>
#include "common/util.h"
#include "common/color.h"
#include "qctmap.h"
@ -198,27 +199,50 @@ static bool readString(QDataStream &stream, quint32 offset, QString &str)
return false;
}
bool QCTMap::readHeader(QDataStream &stream)
bool QCTMap::readName(QDataStream &stream)
{
quint32 version, title, ext, shift;
quint32 title, name;
stream >> version >> _cols >> _rows >> title;
stream >> title >> name;
if (stream.status() != QDataStream::Ok)
return false;
if (!readString(stream, title, _name))
return false;
if (name) {
if (!readString(stream, name, _name))
return false;
} else if (title) {
if (!readString(stream, title, _name))
return false;
} else
_name = Util::file2name(path());
return true;
}
bool QCTMap::readSize(QDataStream &stream)
{
stream >> _cols >> _rows;
return (stream.status() == QDataStream::Ok);
}
bool QCTMap::readDatumShift(QDataStream &stream)
{
quint32 ext, shift;
if (!stream.device()->seek(0x54))
return false;
stream >> ext;
if (stream.status() != QDataStream::Ok)
return false;
if (!ext)
return true;
if (!stream.device()->seek(ext + 4))
return false;
stream >> shift;
if (stream.status() != QDataStream::Ok)
return false;
if (!shift)
return true;
if (!stream.device()->seek(shift))
return false;
stream >> _shiftN >> _shiftE;
@ -226,6 +250,35 @@ bool QCTMap::readHeader(QDataStream &stream)
return (stream.status() == QDataStream::Ok);
}
bool QCTMap::readHeader(QDataStream &stream)
{
quint32 magic, version;
stream >> magic >> version;
if (stream.status() != QDataStream::Ok || magic != MAGIC) {
_errorString = "Not a QCT map";
return false;
}
if (version == 0x20000001) {
_errorString = "QC3 files not supported";
return false;
}
if (!readSize(stream)) {
_errorString = "Error reading map dimensions";
return false;
}
if (!readName(stream)) {
_errorString = "Error reading map name";
return false;
}
if (!readDatumShift(stream)) {
_errorString = "Error reading datum shift";
return false;
}
return true;
}
bool QCTMap::readGeoRef(QDataStream &stream)
{
if (!stream.device()->seek(0x60))
@ -270,7 +323,8 @@ bool QCTMap::readIndex(QDataStream &stream)
}
QCTMap::QCTMap(const QString &fileName, QObject *parent)
: Map(fileName, parent), _file(fileName), _mapRatio(1.0), _valid(false)
: Map(fileName, parent), _file(fileName), _shiftE(0), _shiftN(0),
_mapRatio(1.0), _valid(false)
{
if (!_file.open(QIODevice::ReadOnly)) {
_errorString = fileName + ": " + _file.errorString();
@ -279,17 +333,9 @@ QCTMap::QCTMap(const QString &fileName, QObject *parent)
QDataStream stream(&_file);
stream.setByteOrder(QDataStream::LittleEndian);
quint32 magic;
stream >> magic;
if (magic != MAGIC) {
_errorString = "Not a QCT map";
if (!readHeader(stream))
return;
}
if (!readHeader(stream)) {
_errorString = "Error reading QCT header";
return;
}
if (!readGeoRef(stream)) {
_errorString = "Error reading georeference info";
return;

3
src/map/qctmap.h
View File

@ -31,6 +31,9 @@ public:
QString errorString() const {return _errorString;}
private:
bool readName(QDataStream &stream);
bool readSize(QDataStream &stream);
bool readDatumShift(QDataStream &stream);
bool readHeader(QDataStream &stream);
bool readGeoRef(QDataStream &stream);
bool readIndex(QDataStream &stream);