summaryrefslogtreecommitdiff
path: root/src/tilematrix_type.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/tilematrix_type.hpp')
-rw-r--r--src/tilematrix_type.hpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tilematrix_type.hpp b/src/tilematrix_type.hpp
index 118c994cd..2ca165dc0 100644
--- a/src/tilematrix_type.hpp
+++ b/src/tilematrix_type.hpp
@@ -95,14 +95,14 @@ public:
uint tile_y = (TileY(tile) / N) * N;
uint w = N, h = N;
- w += min(extend * N, tile_x);
- h += min(extend * N, tile_y);
+ w += std::min(extend * N, tile_x);
+ h += std::min(extend * N, tile_y);
- tile_x -= min(extend * N, tile_x);
- tile_y -= min(extend * N, tile_y);
+ tile_x -= std::min(extend * N, tile_x);
+ tile_y -= std::min(extend * N, tile_y);
- w += min(extend * N, MapSizeX() - tile_x - w);
- h += min(extend * N, MapSizeY() - tile_y - h);
+ w += std::min(extend * N, MapSizeX() - tile_x - w);
+ h += std::min(extend * N, MapSizeY() - tile_y - h);
return TileArea(TileXY(tile_x, tile_y), w, h);
}