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

Fixed error handling

Browse Source
This commit is contained in:
Martin Tůma 2024-01-02 19:06:10 +01:00
parent 7a7a331b58
commit 6b4990a204
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/map/gmifile.cpp
View File

@ -24,11 +24,6 @@ bool GmiFile::parse(QIODevice &device)
int width, height; int width, height;
bool ok; bool ok;
if (!device.open(QIODevice::ReadOnly)) {
_errorString = device.errorString();
return false;
}
while (!device.atEnd()) { while (!device.atEnd()) {
QByteArray line = device.readLine(4096); QByteArray line = device.readLine(4096);
@ -42,13 +37,13 @@ bool GmiFile::parse(QIODevice &device)
else if (ln == 3) { else if (ln == 3) {
width = line.toInt(&ok); width = line.toInt(&ok);
if (!ok || width <= 0) { if (!ok || width <= 0) {
_errorString = "Invalid image width"; _errorString = line + ": invalid image width";
return false; return false;
} }
} else if (ln == 4) { } else if (ln == 4) {
height = line.toInt(&ok); height = line.toInt(&ok);
if (!ok || height <= 0) { if (!ok || height <= 0) {
_errorString = "Invalid image height"; _errorString = line + ": invalid image height";
return false; return false;
} }
_size = QSize(width, height); _size = QSize(width, height);
@ -56,19 +51,34 @@ bool GmiFile::parse(QIODevice &device)
CalibrationPoint cp(calibrationPoint(line)); CalibrationPoint cp(calibrationPoint(line));
if (cp.isValid()) if (cp.isValid())
_points.append(cp); _points.append(cp);
else else {
if (_points.size() < 2) {
_errorString = line + ": invalid calibration point";
return false;
} else
break; break;
} }
}
ln++; ln++;
} }
device.close(); if (ln < 6) {
_errorString = "Unexpected EOF";
return (_points.size() >= 2); return false;
} }
GmiFile::GmiFile(QIODevice &file) return true;
}
GmiFile::GmiFile(QIODevice &file) : _valid(false)
{ {
_valid = parse(file); if (!file.open(QIODevice::ReadOnly)) {
_errorString = file.errorString();
return;
}
_valid = parse(file);
file.close();
} }