diff --git a/libs/map/mapview.cpp b/libs/map/mapview.cpp index a1247ed..62ada04 100644 --- a/libs/map/mapview.cpp +++ b/libs/map/mapview.cpp @@ -215,7 +215,7 @@ void MapView::checkZoom() { if (zoom_ < 0.) zoom_ = 0.; if (zoom_ > max) zoom_ = max; double mins = qMin(width(), height()) / appScale(this); - scale_ = std::pow(2., zoom_) * tileSize / mins; + scale_ = pow(2., zoom_) * tileSize / mins; updateViewRect(); } diff --git a/libs/map/osm_types_p.h b/libs/map/osm_types_p.h index 4203b26..778ece8 100644 --- a/libs/map/osm_types_p.h +++ b/libs/map/osm_types_p.h @@ -40,16 +40,16 @@ struct TilePixmap { int pixmapBytes() const; }; -} // namespace OSM - -inline bool operator==(const OSM::TileIndex & v0, const OSM::TileIndex & v1) { +inline bool operator==(const TileIndex & v0, const TileIndex & v1) { 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; } +} // namespace OSM + Q_DECLARE_METATYPE(OSM::TileIndex); Q_DECLARE_METATYPE(OSM::TilePixmap);