renamed WITH(HAVE)_EIGEN2 to WITH(HAVE)_EIGEN, fixed compilation error if eigen3...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc9acd2..022a4e8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -307,7 +307,7 @@ endif()
 \r
 set(WITH_TBB OFF CACHE BOOL "Include Intel TBB support")\r
 set(WITH_IPP OFF CACHE BOOL "Include Intel IPP support")\r
-set(WITH_EIGEN2 ON CACHE BOOL "Include Eigen2/Eigen3 support")\r
+set(WITH_EIGEN ON CACHE BOOL "Include Eigen2/Eigen3 support")\r
 set(WITH_CUDA OFF CACHE BOOL "Include NVidia Cuda Runtime support")\r
 \r
 if(WIN32)\r
@@ -786,16 +786,16 @@ if(WITH_OPENNI)
     include(OpenCVFindOpenNI.cmake)\r
 endif()\r
 \r
-############################## Eigen2 ##############################\r
+############################## Eigen ##############################\r
 \r
-if(WITH_EIGEN2)\r
-        find_path(EIGEN2_INCLUDE_PATH "Eigen/Core"\r
+if(WITH_EIGEN)\r
+        find_path(EIGEN_INCLUDE_PATH "Eigen/Core"\r
             PATHS "/usr/local/include/eigen2" "/opt/include/eigen2" "/usr/include/eigen2"\r
             "/usr/local/include/eigen3" "/opt/include/eigen3" "/usr/include/eigen3"\r
             DOC "The path to Eigen2/Eigen3 headers")\r
-    if(EIGEN2_INCLUDE_PATH)\r
-        include_directories(${EIGEN2_INCLUDE_PATH})\r
-        set(HAVE_EIGEN2 1)\r
+    if(EIGEN_INCLUDE_PATH)\r
+        include_directories(${EIGEN_INCLUDE_PATH})\r
+        set(HAVE_EIGEN 1)\r
     endif()\r
 endif()\r
 \r
@@ -1481,10 +1481,10 @@ else()
 message(STATUS "    Use Cuda:                   NO")\r
 endif()\r
 \r
-if(HAVE_EIGEN2)\r
-message(STATUS "    Use Eigen2:                 YES")\r
+if(HAVE_EIGEN)\r
+message(STATUS "    Use Eigen:                  YES")\r
 else()\r
-message(STATUS "    Use Eigen2:                 NO")\r
+message(STATUS "    Use Eigen:                  NO")\r
 endif()\r
 \r
 message(STATUS "")\r

diff --git a/cvconfig.h.cmake b/cvconfig.h.cmake
index 138defa..38cbe30 100644 (file)
--- a/cvconfig.h.cmake
+++ b/cvconfig.h.cmake
@@ -163,8 +163,8 @@
 /* Threading Framework --- temporary decision for ARM instead of Intel TBB  */
 #cmakedefine  HAVE_THREADING_FRAMEWORK
 
-/* Eigen2 Matrix & Linear Algebra Library */
-#cmakedefine  HAVE_EIGEN2
+/* Eigen Matrix & Linear Algebra Library */
+#cmakedefine  HAVE_EIGEN
 
 /* NVidia Cuda Runtime API*/
 #cmakedefine HAVE_CUDA

diff --git a/modules/core/include/opencv2/core/internal.hpp b/modules/core/include/opencv2/core/internal.hpp
index 5fabd24..9826bf7 100644 (file)
--- a/modules/core/include/opencv2/core/internal.hpp
+++ b/modules/core/include/opencv2/core/internal.hpp
@@ -147,7 +147,7 @@ CV_INLINE IppiSize ippiSize(int width, int height)
     #endif
 #endif
 
-#ifdef HAVE_EIGEN2
+#ifdef HAVE_EIGEN
     #include <Eigen/Core>
     #include "opencv2/core/eigen.hpp"
 #endif

diff --git a/modules/features2d/src/matchers.cpp b/modules/features2d/src/matchers.cpp
index 6a4cafd..c977ebb 100755 (executable)
--- a/modules/features2d/src/matchers.cpp
+++ b/modules/features2d/src/matchers.cpp
@@ -41,7 +41,7 @@
 
 #include "precomp.hpp"
 
-#ifdef HAVE_EIGEN2
+#if defined(HAVE_EIGEN) && EIGEN_WORLD_VERSION == 2
 #include <Eigen/Array>
 #endif
 
@@ -351,9 +351,18 @@ template<>
 void BruteForceMatcher<L2<float> >::knnMatchImpl( const Mat& queryDescriptors, vector<vector<DMatch> >& matches, int knn,
                                               const vector<Mat>& masks, bool compactResult )
 {
-#ifndef HAVE_EIGEN2
+#ifndef HAVE_EIGEN
     commonKnnMatchImpl( *this, queryDescriptors, matches, knn, masks, compactResult );
 #else
+
+#if EIGEN_WORLD_VERSION == 2
+    printf("EIGEN VERSION = 2 ");
+#endif
+
+#if EIGEN_WORLD_VERSION == 3
+    printf("EIGEN VERSION = 3 ");
+#endif
+
     CV_Assert( queryDescriptors.type() == CV_32FC1 ||  queryDescriptors.empty() );
     CV_Assert( masks.empty() || masks.size() == trainDescCollection.size() );
 
@@ -439,7 +448,7 @@ template<>
 void BruteForceMatcher<L2<float> >::radiusMatchImpl( const Mat& queryDescriptors, vector<vector<DMatch> >& matches, float maxDistance,
                                                      const vector<Mat>& masks, bool compactResult )
 {
-#ifndef HAVE_EIGEN2
+#ifndef HAVE_EIGEN
     commonRadiusMatchImpl( *this, queryDescriptors, matches, maxDistance, masks, compactResult );
 #else
     CV_Assert( queryDescriptors.type() == CV_32FC1 ||  queryDescriptors.empty() );