Build warning fix on Windows for Eigen wrapper.

2 years ago · 4eec739624
parent be84824530
commit 4eec739624
1 changed files with 2 additions and 0 deletions
--- a/modules/core/include/opencv2/core/eigen.hpp
+++ b/modules/core/include/opencv2/core/eigen.hpp
@ -52,7 +52,9 @@
 #include "opencv2/core.hpp"

 #if defined _MSC_VER && _MSC_VER >= 1200
+#ifndef NOMINMAX
 #define NOMINMAX // fix https://github.com/opencv/opencv/issues/17548
+#endif
 #pragma warning( disable: 4714 ) //__forceinline is not inlined
 #pragma warning( disable: 4127 ) //conditional expression is constant
 #pragma warning( disable: 4244 ) //conversion from '__int64' to 'int', possible loss of data