Skip to content

Commit b314cc4

Browse files
committed
Merge pull request opencv#18506 from alalek:issue_18472
2 parents 2f065b8 + d34717d commit b314cc4

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

modules/core/include/opencv2/core/eigen.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,13 @@
5858
#pragma warning( disable: 4244 ) //conversion from '__int64' to 'int', possible loss of data
5959
#endif
6060

61+
#if !defined(OPENCV_DISABLE_EIGEN_TENSOR_SUPPORT)
6162
#if EIGEN_WORLD_VERSION == 3 && EIGEN_MAJOR_VERSION >= 3 \
6263
&& defined(CV_CXX11) && defined(CV_CXX_STD_ARRAY)
6364
#include <unsupported/Eigen/CXX11/Tensor>
64-
#define OPENCV_EIGEN_TENSOR_SUPPORT
65-
#endif // EIGEN_WORLD_VERSION == 3 && EIGEN_MAJOR_VERSION >= 3
65+
#define OPENCV_EIGEN_TENSOR_SUPPORT 1
66+
#endif // EIGEN_WORLD_VERSION == 3 && EIGEN_MAJOR_VERSION >= 3
67+
#endif // !defined(OPENCV_DISABLE_EIGEN_TENSOR_SUPPORT)
6668

6769
namespace cv
6870
{

0 commit comments

Comments
 (0)