Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

features2d cleanup: Move several feature detectors and descriptors to opencv_contrib #3709

Merged
merged 11 commits into from
Oct 10, 2024
Merged

features2d cleanup: Move several feature detectors and descriptors to opencv_contrib #3709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
58f2733
Move KAZE, AKAZE, AgastFeatureDetector, BRISK, BOWImgDescriptorExtrac…
kaingwade Mar 27, 2024
ae91fe6
Make changes to relevant documentation
kaingwade Mar 29, 2024
79bc173
Delete irrelevant files.
kaingwade Apr 7, 2024
ae01832
Continue cleanup
kaingwade Apr 28, 2024
c474589
java test
kaingwade Jul 10, 2024
862d089
Some workaround to overcome compile errors of java tests, related to …
kaingwade Jul 18, 2024
bfdde4b
For Python documentation warnings after the workaround
kaingwade Jul 19, 2024
29962d0
Move samples for legacy features to contrib
kaingwade Jul 25, 2024
08e7060
Move docs of legacy features to contrib
kaingwade Jul 25, 2024
9dccfee
Revert "Move samples for legacy features to contrib"
kaingwade Jul 25, 2024
9940413
Code review fixes.
asmorkalov Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/ccalib/CMakeLists.txt
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading