1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-04-21 20:59:11 +02:00

Compare commits

..

2 Commits

Author SHA1 Message Date
c97561add4 Code cleanup 2024-01-01 10:58:23 +01:00
d994fae4ce Fixed the change that has broken non-TAR maps
Do not fail on the first image read error - there may be files with a "_%u_%u."
file name match that are not image tiles.
2024-01-01 10:48:16 +01:00

View File

@ -272,7 +272,7 @@ bool OziMap::setTileInfo(const QStringList &tiles, const QString &path)
for (int i = 0; i < tiles.size(); i++) { for (int i = 0; i < tiles.size(); i++) {
const QString &tile = tiles.at(i); const QString &tile = tiles.at(i);
if (tile.startsWith("set/") && tile.contains(rx)) { if (tile.contains(rx)) {
_tile.path = QString(tile).replace(rx, "_%1_%2."); _tile.path = QString(tile).replace(rx, "_%1_%2.");
if (_tar) { if (_tar) {
@ -283,14 +283,12 @@ bool OziMap::setTileInfo(const QStringList &tiles, const QString &path)
_tile.path = path + "/" + _tile.path; _tile.path = path + "/" + _tile.path;
_tile.size = QImageReader(path + "/" + tile).size(); _tile.size = QImageReader(path + "/" + tile).size();
} }
if (!_tile.size.isValid()) {
_errorString = QString("Error retrieving tile size: "
"%1: Invalid image").arg(QFileInfo(tile).fileName());
return false;
}
_map.path = QString(); if (_tile.size.isValid()) {
return true; _map.path = QString();
return true;
} else
qWarning("%s: error reading tile image", qPrintable(tile));
} }
} }