root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-01-31 09:05:14 +01:00
Code Issues Projects Releases Activity

Code cleanup

Browse Source
This commit is contained in:
Martin Tůma 2023-12-10 08:51:18 +01:00
parent 63d3558b14
commit 5525ba6e8c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/map/tileloader.cpp
View File

@ -7,6 +7,8 @@
#include "tileloader.h" #include "tileloader.h"
#define SUBSTITUTE_CHAR '$' #define SUBSTITUTE_CHAR '$'
#define IS_INT(zoom) \
((QMetaType::Type)((zoom).type()) == QMetaType::Int)
class TileImage class TileImage
{ {
@ -18,7 +20,8 @@ public:
void load() void load()
{ {
QImage img; QImage img;
QByteArray z(_tile->zoom().toString().toLatin1()); QByteArray z(IS_INT(_tile->zoom())
? QByteArray::number(_tile->zoom().toInt()) : QByteArray());
QImageReader reader(_file, z); QImageReader reader(_file, z);
if (_scaledSize) if (_scaledSize)
reader.setScaledSize(QSize(_scaledSize, _scaledSize)); reader.setScaledSize(QSize(_scaledSize, _scaledSize));
@ -220,7 +223,7 @@ QUrl TileLoader::tileUrl(const FetchTile &tile) const
QString TileLoader::tileFile(const FetchTile &tile) const QString TileLoader::tileFile(const FetchTile &tile) const
{ {
QString zoom(((QMetaType::Type)(tile.zoom().type()) == QMetaType::Int) QString zoom(IS_INT(tile.zoom())
? tile.zoom().toString() : fsSafeStr(tile.zoom().toString())); ? tile.zoom().toString() : fsSafeStr(tile.zoom().toString()));
return _dir + QLatin1Char('/') + zoom + QLatin1Char('-') return _dir + QLatin1Char('/') + zoom + QLatin1Char('-')