From 5728795cf7501e90964ec2502945aa133d36b25b Mon Sep 17 00:00:00 2001 From: daB0bby Date: Wed, 21 Sep 2016 13:22:58 +0200 Subject: [PATCH] Merge pull request #7320 from daB0bby:patch-1 * bypass makro * syntax --- modules/objdetect/include/opencv2/objdetect.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/objdetect/include/opencv2/objdetect.hpp b/modules/objdetect/include/opencv2/objdetect.hpp index 87d7ec3ac5..b92467db2c 100644 --- a/modules/objdetect/include/opencv2/objdetect.hpp +++ b/modules/objdetect/include/opencv2/objdetect.hpp @@ -124,7 +124,7 @@ public: SimilarRects(double _eps) : eps(_eps) {} inline bool operator()(const Rect& r1, const Rect& r2) const { - double delta = eps*(std::min(r1.width, r2.width) + std::min(r1.height, r2.height))*0.5; + double delta = eps * ((std::min)(r1.width, r2.width) + (std::min)(r1.height, r2.height)) * 0.5; return std::abs(r1.x - r2.x) <= delta && std::abs(r1.y - r2.y) <= delta && std::abs(r1.x + r1.width - r2.x - r2.width) <= delta &&