Skip to content

Commit

Permalink
Merge pull request #3709 from kaingwade:features2d_parts_to_contrib
Browse files Browse the repository at this point in the history
features2d cleanup: [#24999](opencv/opencv#24999)

Main PR: opencv/opencv#25292, which moves KAZE, AKAZE, AgastFeatureDetector, BRISK and BOW to opencv_contrib/xfeatures2d.
  • Loading branch information
kaingwade authored Oct 10, 2024
1 parent 29d7874 commit d131137
Show file tree
Hide file tree
Showing 61 changed files with 45,870 additions and 8 deletions.
2 changes: 1 addition & 1 deletion modules/ccalib/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 2 additions & 2 deletions modules/ccalib/include/opencv2/ccalib/multicalib.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions modules/ccalib/include/opencv2/ccalib/randpattern.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#define __OPENCV_RANDOMPATTERN_HPP__

#include "opencv2/features2d.hpp"
#include "opencv2/xfeatures2d.hpp"
#include "opencv2/highgui.hpp"

namespace cv { namespace randpattern {
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions modules/ccalib/src/precomp.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading

0 comments on commit d131137

Please sign in to comment.