SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

clang fix

Browse Source
This commit is contained in:
Пелипенко Иван
2023-03-06 19:53:40 +03:00
parent 254a88e7a4
commit 17fc04c2c6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/map/mapview.cpp
View File

@@ -215,7 +215,7 @@ void MapView::checkZoom() {
if (zoom_ < 0.) zoom_ = 0.; if (zoom_ < 0.) zoom_ = 0.;
if (zoom_ > max) zoom_ = max; if (zoom_ > max) zoom_ = max;
double mins = qMin(width(), height()) / appScale(this); double mins = qMin(width(), height()) / appScale(this);
scale_ = std::pow(2., zoom_) * tileSize / mins; scale_ = pow(2., zoom_) * tileSize / mins;
updateViewRect(); updateViewRect();
} }

8
libs/map/osm_types_p.h
View File

@@ -40,16 +40,16 @@ struct TilePixmap {
int pixmapBytes() const; int pixmapBytes() const;
}; };
} // namespace OSM inline bool operator==(const TileIndex & v0, const TileIndex & v1) {
inline bool operator==(const OSM::TileIndex & v0, const OSM::TileIndex & v1) {
return (v0.z == v1.z) && (v0.x == v1.x) && (v0.y == v1.y); return (v0.z == v1.z) && (v0.x == v1.x) && (v0.y == v1.y);
} }
inline bool operator==(const OSM::TilePixmap & v0, const OSM::TilePixmap & v1) { inline bool operator==(const TilePixmap & v0, const TilePixmap & v1) {
return v0.index == v1.index; return v0.index == v1.index;
} }
} // namespace OSM
Q_DECLARE_METATYPE(OSM::TileIndex); Q_DECLARE_METATYPE(OSM::TileIndex);
Q_DECLARE_METATYPE(OSM::TilePixmap); Q_DECLARE_METATYPE(OSM::TilePixmap);