File tree Expand file tree Collapse file tree 1 file changed +7
-6
lines changed
modules/core/include/opencv2/core Expand file tree Collapse file tree 1 file changed +7
-6
lines changed Original file line number Diff line number Diff line change 51
51
52
52
#include " opencv2/core.hpp"
53
53
54
- #if EIGEN_WORLD_VERSION == 3 && EIGEN_MAJOR_VERSION >= 3 \
55
- && defined(CV_CXX11) && defined(CV_CXX_STD_ARRAY)
56
- #include < unsupported/Eigen/CXX11/Tensor>
57
- #define OPENCV_EIGEN_TENSOR_SUPPORT
58
- #endif // EIGEN_WORLD_VERSION == 3 && EIGEN_MAJOR_VERSION >= 3
59
-
60
54
#if defined _MSC_VER && _MSC_VER >= 1200
55
+ #define NOMINMAX // fix https://github.com/opencv/opencv/issues/17548
61
56
#pragma warning( disable: 4714 ) // __forceinline is not inlined
62
57
#pragma warning( disable: 4127 ) // conditional expression is constant
63
58
#pragma warning( disable: 4244 ) // conversion from '__int64' to 'int', possible loss of data
64
59
#endif
65
60
61
+ #if EIGEN_WORLD_VERSION == 3 && EIGEN_MAJOR_VERSION >= 3 \
62
+ && defined(CV_CXX11) && defined(CV_CXX_STD_ARRAY)
63
+ #include < unsupported/Eigen/CXX11/Tensor>
64
+ #define OPENCV_EIGEN_TENSOR_SUPPORT
65
+ #endif // EIGEN_WORLD_VERSION == 3 && EIGEN_MAJOR_VERSION >= 3
66
+
66
67
namespace cv
67
68
{
68
69
You can’t perform that action at this time.
0 commit comments