1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 07:13:02 +04:00

Merge pull request #25292 from kaingwade:features2d_parts_to_contrib

Features2d cleanup: Move several feature detectors and descriptors to opencv_contrib #25292

features2d cleanup: #24999

The PR moves KAZE, AKAZE, AgastFeatureDetector, BRISK and BOW to opencv_contrib/xfeatures2d.

Related PR: opencv/opencv_contrib#3709
This commit is contained in:
WU Jia
2024-10-10 22:10:22 +08:00
committed by GitHub
parent 9dbfba0fd8
commit ef98c25d60
75 changed files with 110 additions and 45699 deletions
+10 -2
View File
@@ -5,6 +5,9 @@
#include <opencv2/3d.hpp>
#include <iostream>
#include <iomanip>
#ifdef HAVE_OPENCV_XFEATURES2D
#include "opencv2/xfeatures2d.hpp"
#endif
using namespace std;
using namespace cv;
@@ -33,7 +36,7 @@ int main(int argc, char** argv)
vector<String> fileName;
cv::CommandLineParser parser(argc, argv,
"{help h ||}"
"{feature|brisk|}"
"{feature|orb|}"
"{flann||}"
"{maxlines|50|}"
"{image1|aero1.jpg|}{image2|aero3.jpg|}");
@@ -88,11 +91,16 @@ int main(int argc, char** argv)
}
else if (feature == "brisk")
{
backend = BRISK::create();
#ifdef HAVE_OPENCV_XFEATURES2D
backend = xfeatures2d::BRISK::create();
if (useFlann)
matcher = makePtr<FlannBasedMatcher>(makePtr<flann::LshIndexParams>(6, 12, 1));
else
matcher = DescriptorMatcher::create("BruteForce-Hamming");
#else
cout << "OpenCV is built without opencv_contrib modules. BRISK algorithm is not available!" << std::endl;
return -1;
#endif
}
else
{