Move KAZE, AKAZE, AgastFeatureDetector, BRISK, BOWImgDescriptorExtrac…

…tor to contrib/xfeatures2d
opencv · Apr 27, 2024 · 58f2733 · 58f2733
1 parent 1400863
commit 58f2733
Show file tree

Hide file tree

Showing 58 changed files with 46,214 additions and 7 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+    "files.associations": {
+        "atomic": "cpp",
+        "bitset": "cpp"
+    }
+}
diff --git a/modules/ccalib/CMakeLists.txt b/modules/ccalib/CMakeLists.txt
@@ -1,2 +1,2 @@
 set(the_description "Custom Calibration Pattern")
-ocv_define_module(ccalib opencv_core opencv_imgproc opencv_3d opencv_calib opencv_features2d opencv_highgui opencv_imgcodecs WRAP python)
+ocv_define_module(ccalib opencv_core opencv_imgproc opencv_3d opencv_calib opencv_features2d opencv_xfeatures2d opencv_highgui opencv_imgcodecs WRAP python)
diff --git a/modules/ccalib/include/opencv2/ccalib/multicalib.hpp b/modules/ccalib/include/opencv2/ccalib/multicalib.hpp
@@ -132,8 +132,8 @@ class CV_EXPORTS MultiCameraCalibration
     MultiCameraCalibration(int cameraType, int nCameras, const std::string& fileName, float patternWidth,
         float patternHeight, int verbose = 0, int showExtration = 0, int nMiniMatches = 20, int flags = 0,
         TermCriteria criteria = TermCriteria(TermCriteria::COUNT + TermCriteria::EPS, 200, 1e-7),
-        Ptr<FeatureDetector> detector = AKAZE::create(AKAZE::DESCRIPTOR_MLDB, 0, 3, 0.006f),
-        Ptr<DescriptorExtractor> descriptor = AKAZE::create(AKAZE::DESCRIPTOR_MLDB,0, 3, 0.006f),
+        Ptr<FeatureDetector> detector = xfeatures2d::AKAZE::create(xfeatures2d::AKAZE::DESCRIPTOR_MLDB, 0, 3, 0.006f),
+        Ptr<DescriptorExtractor> descriptor = xfeatures2d::AKAZE::create(xfeatures2d::AKAZE::DESCRIPTOR_MLDB,0, 3, 0.006f),
         Ptr<DescriptorMatcher> matcher = DescriptorMatcher::create("BruteForce-L1"));
 
     /* @brief load images

diff --git a/modules/ccalib/include/opencv2/ccalib/randpattern.hpp b/modules/ccalib/include/opencv2/ccalib/randpattern.hpp
@@ -43,6 +43,7 @@
 #define __OPENCV_RANDOMPATTERN_HPP__
 
 #include "opencv2/features2d.hpp"
+#include "opencv2/xfeatures2d.hpp"
 #include "opencv2/highgui.hpp"
 
 namespace cv { namespace randpattern {
@@ -79,8 +80,8 @@ class CV_EXPORTS RandomPatternCornerFinder
     */
     RandomPatternCornerFinder(float patternWidth, float patternHeight,
         int nminiMatch = 20, int depth = CV_32F, int verbose = 0, int showExtraction = 0,
-        Ptr<FeatureDetector> detector = AKAZE::create(AKAZE::DESCRIPTOR_MLDB, 0, 3, 0.005f),
-        Ptr<DescriptorExtractor> descriptor = AKAZE::create(AKAZE::DESCRIPTOR_MLDB,0, 3, 0.005f),
+        Ptr<FeatureDetector> detector = xfeatures2d::AKAZE::create(xfeatures2d::AKAZE::DESCRIPTOR_MLDB, 0, 3, 0.005f),
+        Ptr<DescriptorExtractor> descriptor = xfeatures2d::AKAZE::create(xfeatures2d::AKAZE::DESCRIPTOR_MLDB,0, 3, 0.005f),
         Ptr<DescriptorMatcher> matcher = DescriptorMatcher::create("BruteForce-L1"));
 
     /* @brief Load pattern image and compute features for pattern

diff --git a/modules/ccalib/src/precomp.hpp b/modules/ccalib/src/precomp.hpp
@@ -47,6 +47,7 @@
 #include <opencv2/3d.hpp>
 #include <opencv2/calib.hpp>
 #include <opencv2/features2d.hpp>
+#include "opencv2/xfeatures2d.hpp"
 #include "opencv2/imgcodecs.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/highgui.hpp"