Merge pull request opencv#9848 from jet47:features2d-optional-flann-dep

vpisarev · vpisarev · commit 29144436851c · 2017-10-16T10:45:16.000Z
diff --git a/modules/calib3d/src/circlesgrid.cpp b/modules/calib3d/src/circlesgrid.cpp
@@ -392,6 +392,12 @@ void CirclesGridClusterFinder::rectifyPatternPoints(const std::vector<cv::Point2
 
 void CirclesGridClusterFinder::parsePatternPoints(const std::vector<cv::Point2f> &patternPoints, const std::vector<cv::Point2f> &rectifiedPatternPoints, std::vector<cv::Point2f> &centers)
 {
+#ifndef HAVE_OPENCV_FLANN
+  (void)patternPoints;
+  (void)rectifiedPatternPoints;
+  (void)centers;
+  CV_Error(Error::StsNotImplemented, "The desired functionality requires flann module, which was disabled.");
+#else
   flann::LinearIndexParams flannIndexParams;
   flann::Index flannIndex(Mat(rectifiedPatternPoints).reshape(1), flannIndexParams);
 
@@ -425,6 +431,7 @@ void CirclesGridClusterFinder::parsePatternPoints(const std::vector<cv::Point2f>
       }
     }
   }
+#endif
 }
 
 Graph::Graph(size_t n)
diff --git a/modules/calib3d/test/test_chesscorners.cpp b/modules/calib3d/test/test_chesscorners.cpp
@@ -468,6 +468,8 @@ bool CV_ChessboardDetectorTest::checkByGenerator()
 TEST(Calib3d_ChessboardDetector, accuracy) {  CV_ChessboardDetectorTest test( CHESSBOARD ); test.safe_run(); }
 TEST(Calib3d_CirclesPatternDetector, accuracy) { CV_ChessboardDetectorTest test( CIRCLES_GRID ); test.safe_run(); }
 TEST(Calib3d_AsymmetricCirclesPatternDetector, accuracy) { CV_ChessboardDetectorTest test( ASYMMETRIC_CIRCLES_GRID ); test.safe_run(); }
+#ifdef HAVE_OPENCV_FLANN
 TEST(Calib3d_AsymmetricCirclesPatternDetectorWithClustering, accuracy) { CV_ChessboardDetectorTest test( ASYMMETRIC_CIRCLES_GRID, CALIB_CB_CLUSTERING ); test.safe_run(); }
+#endif
 
 /* End of file. */
diff --git a/modules/features2d/CMakeLists.txt b/modules/features2d/CMakeLists.txt
@@ -1,2 +1,2 @@
 set(the_description "2D Features Framework")
-ocv_define_module(features2d opencv_imgproc opencv_flann OPTIONAL opencv_highgui WRAP java python)
+ocv_define_module(features2d opencv_imgproc OPTIONAL opencv_flann opencv_highgui WRAP java python)
diff --git a/modules/features2d/include/opencv2/features2d.hpp b/modules/features2d/include/opencv2/features2d.hpp
@@ -43,8 +43,12 @@
 #ifndef OPENCV_FEATURES_2D_HPP
 #define OPENCV_FEATURES_2D_HPP
 
+#include "opencv2/opencv_modules.hpp"
 #include "opencv2/core.hpp"
+
+#ifdef HAVE_OPENCV_FLANN
 #include "opencv2/flann/miniflann.hpp"
+#endif
 
 /**
   @defgroup features2d 2D Features Framework
@@ -1099,6 +1103,7 @@ class CV_EXPORTS_W BFMatcher : public DescriptorMatcher
     bool crossCheck;
 };
 
+#if defined(HAVE_OPENCV_FLANN) || defined(CV_DOXYGEN)
 
 /** @brief Flann-based descriptor matcher.
 
@@ -1145,6 +1150,8 @@ class CV_EXPORTS_W FlannBasedMatcher : public DescriptorMatcher
     int addedDescCount;
 };
 
+#endif
+
 //! @} features2d_match
 
 /****************************************************************************************\
diff --git a/modules/features2d/src/matchers.cpp b/modules/features2d/src/matchers.cpp
@@ -1005,11 +1005,14 @@ void BFMatcher::radiusMatchImpl( InputArray _queryDescriptors, std::vector<std::
 Ptr<DescriptorMatcher> DescriptorMatcher::create( const String& descriptorMatcherType )
 {
     Ptr<DescriptorMatcher> dm;
+#ifdef HAVE_OPENCV_FLANN
     if( !descriptorMatcherType.compare( "FlannBased" ) )
     {
         dm = makePtr<FlannBasedMatcher>();
     }
-    else if( !descriptorMatcherType.compare( "BruteForce" ) ) // L2
+    else
+#endif
+    if( !descriptorMatcherType.compare( "BruteForce" ) ) // L2
     {
         dm = makePtr<BFMatcher>(int(NORM_L2)); // anonymous enums can't be template parameters
     }
@@ -1044,9 +1047,11 @@ Ptr<DescriptorMatcher> DescriptorMatcher::create(int matcherType)
 
     switch(matcherType)
     {
+#ifdef HAVE_OPENCV_FLANN
     case FLANNBASED:
         name = "FlannBased";
         break;
+#endif
     case BRUTEFORCE:
         name = "BruteForce";
         break;
@@ -1071,6 +1076,7 @@ Ptr<DescriptorMatcher> DescriptorMatcher::create(int matcherType)
 
 }
 
+#ifdef HAVE_OPENCV_FLANN
 
 /*
  * Flann based matcher
@@ -1419,4 +1425,7 @@ void FlannBasedMatcher::radiusMatchImpl( InputArray _queryDescriptors, std::vect
 
     convertToDMatches( mergedDescriptors, indices, dists, matches );
 }
+
+#endif
+
 }
diff --git a/modules/features2d/test/test_matchers_algorithmic.cpp b/modules/features2d/test/test_matchers_algorithmic.cpp
@@ -536,12 +536,14 @@ TEST( Features2d_DescriptorMatcher_BruteForce, regression )
     test.safe_run();
 }
 
+#ifdef HAVE_OPENCV_FLANN
 TEST( Features2d_DescriptorMatcher_FlannBased, regression )
 {
     CV_DescriptorMatcherTest test( "descriptor-matcher-flann-based",
                                   DescriptorMatcher::create("FlannBased"), 0.04f );
     test.safe_run();
 }
+#endif
 
 TEST( Features2d_DMatch, read_write )
 {
diff --git a/modules/features2d/test/test_nearestneighbors.cpp b/modules/features2d/test/test_nearestneighbors.cpp
@@ -49,7 +49,9 @@
 
 using namespace std;
 using namespace cv;
+#ifdef HAVE_OPENCV_FLANN
 using namespace cv::flann;
+#endif
 
 //--------------------------------------------------------------------------------
 class NearestNeighborTest : public cvtest::BaseTest
@@ -158,6 +160,8 @@ void NearestNeighborTest::run( int /*start_from*/ ) {
 }
 
 //--------------------------------------------------------------------------------
+#ifdef HAVE_OPENCV_FLANN
+
 class CV_FlannTest : public NearestNeighborTest
 {
 public:
@@ -331,3 +335,5 @@ TEST(Features2d_FLANN_KDTree, regression) { CV_FlannKDTreeIndexTest test; test.s
 TEST(Features2d_FLANN_Composite, regression) { CV_FlannCompositeIndexTest test; test.safe_run(); }
 TEST(Features2d_FLANN_Auto, regression) { CV_FlannAutotunedIndexTest test; test.safe_run(); }
 TEST(Features2d_FLANN_Saved, regression) { CV_FlannSavedIndexTest test; test.safe_run(); }
+
+#endif
diff --git a/modules/stitching/CMakeLists.txt b/modules/stitching/CMakeLists.txt
@@ -8,6 +8,6 @@ set(STITCHING_CONTRIB_DEPS "opencv_xfeatures2d")
 if(BUILD_SHARED_LIBS AND BUILD_opencv_world AND OPENCV_WORLD_EXCLUDE_EXTRA_MODULES)
   set(STITCHING_CONTRIB_DEPS "")
 endif()
-ocv_define_module(stitching opencv_imgproc opencv_features2d opencv_calib3d
+ocv_define_module(stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_flann
                   OPTIONAL opencv_cudaarithm opencv_cudawarping opencv_cudafeatures2d opencv_cudalegacy ${STITCHING_CONTRIB_DEPS}
                   WRAP python)

Original file line number	Diff line number	Diff line change
`@@ -392,6 +392,12 @@ void CirclesGridClusterFinder::rectifyPatternPoints(const std::vector<cv::Point2`
`392`	`392`
`393`	`393`	`void CirclesGridClusterFinder::parsePatternPoints(const std::vector<cv::Point2f> &patternPoints, const std::vector<cv::Point2f> &rectifiedPatternPoints, std::vector<cv::Point2f> &centers)`
`394`	`394`	`{`
	`395`	`+#ifndef HAVE_OPENCV_FLANN`
	`396`	`+ (void)patternPoints;`
	`397`	`+ (void)rectifiedPatternPoints;`
	`398`	`+ (void)centers;`
	`399`	`+ CV_Error(Error::StsNotImplemented, "The desired functionality requires flann module, which was disabled.");`
	`400`	`+#else`
`395`	`401`	`flann::LinearIndexParams flannIndexParams;`
`396`	`402`	`flann::Index flannIndex(Mat(rectifiedPatternPoints).reshape(1), flannIndexParams);`
`397`	`403`
`@@ -425,6 +431,7 @@ void CirclesGridClusterFinder::parsePatternPoints(const std::vector<cv::Point2f>`
`425`	`431`	`}`
`426`	`432`	`}`
`427`	`433`	`}`
	`434`	`+#endif`
`428`	`435`	`}`
`429`	`436`
`430`	`437`	`Graph::Graph(size_t n)`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`set(the_description "2D Features Framework")`
`2`		`-ocv_define_module(features2d opencv_imgproc opencv_flann OPTIONAL opencv_highgui WRAP java python)`
	`2`	`+ocv_define_module(features2d opencv_imgproc OPTIONAL opencv_flann opencv_highgui WRAP java python)`
Original file line number	Diff line number	Diff line change
`@@ -1005,11 +1005,14 @@ void BFMatcher::radiusMatchImpl( InputArray _queryDescriptors, std::vector<std::`
`1005`	`1005`	`Ptr<DescriptorMatcher> DescriptorMatcher::create( const String& descriptorMatcherType )`
`1006`	`1006`	`{`
`1007`	`1007`	`Ptr<DescriptorMatcher> dm;`
	`1008`	`+#ifdef HAVE_OPENCV_FLANN`
`1008`	`1009`	`if( !descriptorMatcherType.compare( "FlannBased" ) )`
`1009`	`1010`	`{`
`1010`	`1011`	`dm = makePtr<FlannBasedMatcher>();`
`1011`	`1012`	`}`
`1012`		`- else if( !descriptorMatcherType.compare( "BruteForce" ) ) // L2`
	`1013`	`+ else`
	`1014`	`+#endif`
	`1015`	`+ if( !descriptorMatcherType.compare( "BruteForce" ) ) // L2`
`1013`	`1016`	`{`
`1014`	`1017`	`dm = makePtr<BFMatcher>(int(NORM_L2)); // anonymous enums can't be template parameters`
`1015`	`1018`	`}`
`@@ -1044,9 +1047,11 @@ Ptr<DescriptorMatcher> DescriptorMatcher::create(int matcherType)`
`1044`	`1047`
`1045`	`1048`	`switch(matcherType)`
`1046`	`1049`	`{`
	`1050`	`+#ifdef HAVE_OPENCV_FLANN`
`1047`	`1051`	`case FLANNBASED:`
`1048`	`1052`	`name = "FlannBased";`
`1049`	`1053`	`break;`
	`1054`	`+#endif`
`1050`	`1055`	`case BRUTEFORCE:`
`1051`	`1056`	`name = "BruteForce";`
`1052`	`1057`	`break;`
`@@ -1071,6 +1076,7 @@ Ptr<DescriptorMatcher> DescriptorMatcher::create(int matcherType)`
`1071`	`1076`
`1072`	`1077`	`}`
`1073`	`1078`
	`1079`	`+#ifdef HAVE_OPENCV_FLANN`
`1074`	`1080`
`1075`	`1081`	`/*`
`1076`	`1082`	`* Flann based matcher`
`@@ -1419,4 +1425,7 @@ void FlannBasedMatcher::radiusMatchImpl( InputArray _queryDescriptors, std::vect`
`1419`	`1425`
`1420`	`1426`	`convertToDMatches( mergedDescriptors, indices, dists, matches );`
`1421`	`1427`	`}`
	`1428`	`+`
	`1429`	`+#endif`
	`1430`	`+`
`1422`	`1431`	`}`
Original file line number	Diff line number	Diff line change
`@@ -536,12 +536,14 @@ TEST( Features2d_DescriptorMatcher_BruteForce, regression )`
`536`	`536`	`test.safe_run();`
`537`	`537`	`}`
`538`	`538`
	`539`	`+#ifdef HAVE_OPENCV_FLANN`
`539`	`540`	`TEST( Features2d_DescriptorMatcher_FlannBased, regression )`
`540`	`541`	`{`
`541`	`542`	`CV_DescriptorMatcherTest test( "descriptor-matcher-flann-based",`
`542`	`543`	`DescriptorMatcher::create("FlannBased"), 0.04f );`
`543`	`544`	`test.safe_run();`
`544`	`545`	`}`
	`546`	`+#endif`
`545`	`547`
`546`	`548`	`TEST( Features2d_DMatch, read_write )`
`547`	`549`	`{`