paella
/
paella
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adapted DetectionAndMatching to OpenCV3 

... I think... and also removed useless "nonfree" header
This commit is contained in:
Thomas FORGIONE 2016-11-23 16:18:41 +01:00
parent 918f632ccb
commit 99f4a98a2d
No known key found for this signature in database
GPG Key ID: 2A210FFC062E00C3
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/DetectionAndMatching/DetectionAndMatching.cpp
View File

@ -50,8 +50,8 @@ std::vector<std::pair<cv::Point,cv::Point>> detectAndMatch(cv::Mat const& img_1,
std::vector<cv::KeyPoint> keypoints_1, keypoints_2;
cv::BRISK briskd(Threshl,Octaves,PatternScales);//initialize algoritm
briskd.create("Feature2D.BRISK");
cv::BRISK briskd = *cv::BRISK::create(Threshl,Octaves,PatternScales);//initialize algoritm
// briskd.create("Feature2D.BRISK");
briskd.detect(img_1, keypoints_1,masque_1);
briskd.detect( img_2, keypoints_2, masque_2);

1
src/DetectionAndMatching/main.cpp
View File

@ -36,7 +36,6 @@
#include <opencv2/imgproc/imgproc.hpp>
#include <opencv2/core/core.hpp>
#include <opencv2/features2d/features2d.hpp>
#include <opencv2/nonfree/features2d.hpp>
#include <opencv2/highgui/highgui.hpp>
#include <opencv2/calib3d/calib3d.hpp>