diff --git a/modules/stitching/include/opencv2/stitching/detail/warpers_inl.hpp b/modules/stitching/include/opencv2/stitching/detail/warpers_inl.hpp
index 0416ecb5ee..a91dd3f85d 100644
--- a/modules/stitching/include/opencv2/stitching/detail/warpers_inl.hpp
+++ b/modules/stitching/include/opencv2/stitching/detail/warpers_inl.hpp
@@ -150,10 +150,10 @@ Rect RotationWarperBase
::warpRoi(Size src_size, InputArray K, InputArray R)
template
void RotationWarperBase::detectResultRoi(Size src_size, Point &dst_tl, Point &dst_br)
{
- float tl_uf = std::numeric_limits::max();
- float tl_vf = std::numeric_limits::max();
- float br_uf = -std::numeric_limits::max();
- float br_vf = -std::numeric_limits::max();
+ float tl_uf = (std::numeric_limits::max)();
+ float tl_vf = (std::numeric_limits::max)();
+ float br_uf = -(std::numeric_limits::max)();
+ float br_vf = -(std::numeric_limits::max)();
float u, v;
for (int y = 0; y < src_size.height; ++y)
@@ -161,8 +161,8 @@ void RotationWarperBase::detectResultRoi(Size src_size, Point &dst_tl, Point
for (int x = 0; x < src_size.width; ++x)
{
projector_.mapForward(static_cast(x), static_cast(y), u, v);
- tl_uf = std::min(tl_uf, u); tl_vf = std::min(tl_vf, v);
- br_uf = std::max(br_uf, u); br_vf = std::max(br_vf, v);
+ tl_uf = (std::min)(tl_uf, u); tl_vf = (std::min)(tl_vf, v);
+ br_uf = (std::max)(br_uf, u); br_vf = (std::max)(br_vf, v);
}
}
@@ -176,31 +176,31 @@ void RotationWarperBase::detectResultRoi(Size src_size, Point &dst_tl, Point
template
void RotationWarperBase::detectResultRoiByBorder(Size src_size, Point &dst_tl, Point &dst_br)
{
- float tl_uf = std::numeric_limits::max();
- float tl_vf = std::numeric_limits::max();
- float br_uf = -std::numeric_limits::max();
- float br_vf = -std::numeric_limits::max();
+ float tl_uf = (std::numeric_limits::max)();
+ float tl_vf = (std::numeric_limits::max)();
+ float br_uf = -(std::numeric_limits::max)();
+ float br_vf = -(std::numeric_limits::max)();
float u, v;
for (float x = 0; x < src_size.width; ++x)
{
projector_.mapForward(static_cast(x), 0, u, v);
- tl_uf = std::min(tl_uf, u); tl_vf = std::min(tl_vf, v);
- br_uf = std::max(br_uf, u); br_vf = std::max(br_vf, v);
+ tl_uf = (std::min)(tl_uf, u); tl_vf = (std::min)(tl_vf, v);
+ br_uf = (std::max)(br_uf, u); br_vf = (std::max)(br_vf, v);
projector_.mapForward(static_cast(x), static_cast(src_size.height - 1), u, v);
- tl_uf = std::min(tl_uf, u); tl_vf = std::min(tl_vf, v);
- br_uf = std::max(br_uf, u); br_vf = std::max(br_vf, v);
+ tl_uf = (std::min)(tl_uf, u); tl_vf = (std::min)(tl_vf, v);
+ br_uf = (std::max)(br_uf, u); br_vf = (std::max)(br_vf, v);
}
for (int y = 0; y < src_size.height; ++y)
{
projector_.mapForward(0, static_cast(y), u, v);
- tl_uf = std::min(tl_uf, u); tl_vf = std::min(tl_vf, v);
- br_uf = std::max(br_uf, u); br_vf = std::max(br_vf, v);
+ tl_uf = (std::min)(tl_uf, u); tl_vf = (std::min)(tl_vf, v);
+ br_uf = (std::max)(br_uf, u); br_vf = (std::max)(br_vf, v);
projector_.mapForward(static_cast(src_size.width - 1), static_cast(y), u, v);
- tl_uf = std::min(tl_uf, u); tl_vf = std::min(tl_vf, v);
- br_uf = std::max(br_uf, u); br_vf = std::max(br_vf, v);
+ tl_uf = (std::min)(tl_uf, u); tl_vf = (std::min)(tl_vf, v);
+ br_uf = (std::max)(br_uf, u); br_vf = (std::max)(br_vf, v);
}
dst_tl.x = static_cast(tl_uf);