From d482bb7cbdf6b296fa4ab5abcf73fb5ff8c8b239 Mon Sep 17 00:00:00 2001 From: themancalledjakob Date: Sat, 16 Mar 2024 13:20:36 +0100 Subject: [PATCH] explicit std namespace --- src/gpufont/font.hpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gpufont/font.hpp b/src/gpufont/font.hpp index 688f78c..0502eb5 100644 --- a/src/gpufont/font.hpp +++ b/src/gpufont/font.hpp @@ -1147,10 +1147,10 @@ class Font { result.x2 = p2.x; result.y2 = p2.y; direction += getDirection(p0, p2); - bb.xMin = min(bb.xMin, min(p0.x, min(p1.x, p2.x))); - bb.xMax = max(bb.xMax, max(p0.x, max(p1.x, p2.x))); - bb.yMin = min(bb.yMin, min(p0.y, min(p1.y, p2.y))); - bb.yMax = max(bb.yMax, max(p0.y, max(p1.y, p2.y))); + bb.xMin = std::min(bb.xMin, std::min(p0.x, std::min(p1.x, p2.x))); + bb.xMax = std::max(bb.xMax, std::max(p0.x, std::max(p1.x, p2.x))); + bb.yMin = std::min(bb.yMin, std::min(p0.y, std::min(p1.y, p2.y))); + bb.yMax = std::max(bb.yMax, std::max(p0.y, std::max(p1.y, p2.y))); return result; }; @@ -1389,10 +1389,10 @@ class Font { y0 += advanceY; y1 += advanceY; - minX = min(x0, min(x1, minX)); - maxX = max(x0, max(x1, maxX)); - minY = min(y0, min(y1, minY)); - maxY = max(y0, max(y1, maxY)); + minX = std::min(x0, std::min(x1, minX)); + maxX = std::max(x0, std::max(x1, maxX)); + minY = std::min(y0, std::min(y1, minY)); + maxY = std::max(y0, std::max(y1, maxY)); boundingBoxes.push_back({ glm::vec4(x0, y0, 0, 1),