parent
8442dab01d
commit
04ebef1be2
2 changed files with 132 additions and 0 deletions
@ -0,0 +1,71 @@ |
||||
/**
|
||||
* @file SURF_descriptor |
||||
* @brief SURF detector + descritpor + BruteForce Matcher + drawing matches with OpenCV functions |
||||
* @author A. Huaman |
||||
*/ |
||||
|
||||
#include <stdio.h> |
||||
#include <iostream> |
||||
#include "opencv2/core/core.hpp" |
||||
#include "opencv2/features2d/features2d.hpp" |
||||
#include "opencv2/highgui/highgui.hpp" |
||||
|
||||
using namespace cv; |
||||
|
||||
void readme(); |
||||
|
||||
/**
|
||||
* @function main |
||||
* @brief Main function |
||||
*/ |
||||
int main( int argc, char** argv ) |
||||
{ |
||||
if( argc != 3 ) |
||||
{ return -1; } |
||||
|
||||
Mat img_1 = imread( argv[1], CV_LOAD_IMAGE_GRAYSCALE ); |
||||
Mat img_2 = imread( argv[2], CV_LOAD_IMAGE_GRAYSCALE ); |
||||
|
||||
if( !img_1.data || !img_2.data ) |
||||
{ return -1; } |
||||
|
||||
//-- Step 1: Detect the keypoints using SURF Detector
|
||||
int minHessian = 400; |
||||
|
||||
SurfFeatureDetector detector( minHessian ); |
||||
|
||||
std::vector<KeyPoint> keypoints_1, keypoints_2; |
||||
|
||||
detector.detect( img_1, keypoints_1 ); |
||||
detector.detect( img_2, keypoints_2 ); |
||||
|
||||
//-- Step 2: Calculate descriptors (feature vectors)
|
||||
SurfDescriptorExtractor extractor; |
||||
|
||||
Mat descriptors_1, descriptors_2; |
||||
|
||||
extractor.compute( img_1, keypoints_1, descriptors_1 ); |
||||
extractor.compute( img_2, keypoints_2, descriptors_2 ); |
||||
|
||||
//-- Step 3: Matching descriptor vectors with a brute force matcher
|
||||
BruteForceMatcher< L2<float> > matcher; |
||||
std::vector< DMatch > matches; |
||||
matcher.match( descriptors_1, descriptors_2, matches ); |
||||
|
||||
//-- Draw matches
|
||||
Mat img_matches; |
||||
drawMatches( img_1, keypoints_1, img_2, keypoints_2, matches, img_matches );
|
||||
|
||||
//-- Show detected matches
|
||||
imshow("Matches", img_matches ); |
||||
|
||||
waitKey(0); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
/**
|
||||
* @function readme |
||||
*/ |
||||
void readme() |
||||
{ std::cout << " Usage: ./SURF_descriptor <img1> <img2>" << std::endl; } |
@ -0,0 +1,61 @@ |
||||
/**
|
||||
* @file SURF_detector |
||||
* @brief SURF keypoint detection + keypoint drawing with OpenCV functions |
||||
* @author A. Huaman |
||||
*/ |
||||
|
||||
#include <stdio.h> |
||||
#include <iostream> |
||||
#include "opencv2/core/core.hpp" |
||||
#include "opencv2/features2d/features2d.hpp" |
||||
#include "opencv2/highgui/highgui.hpp" |
||||
|
||||
using namespace cv; |
||||
|
||||
void readme(); |
||||
|
||||
/**
|
||||
* @function main |
||||
* @brief Main function |
||||
*/ |
||||
int main( int argc, char** argv ) |
||||
{ |
||||
if( argc != 3 ) |
||||
{ readme(); return -1; } |
||||
|
||||
Mat img_1 = imread( argv[1], CV_LOAD_IMAGE_GRAYSCALE ); |
||||
Mat img_2 = imread( argv[2], CV_LOAD_IMAGE_GRAYSCALE ); |
||||
|
||||
if( !img_1.data || !img_2.data ) |
||||
{ std::cout<< " --(!) Error reading images " << std::endl; return -1; } |
||||
|
||||
//-- Step 1: Detect the keypoints using SURF Detector
|
||||
int minHessian = 400; |
||||
|
||||
SurfFeatureDetector detector( minHessian ); |
||||
|
||||
std::vector<KeyPoint> keypoints_1, keypoints_2; |
||||
|
||||
detector.detect( img_1, keypoints_1 ); |
||||
detector.detect( img_2, keypoints_2 ); |
||||
|
||||
//-- Draw keypoints
|
||||
Mat img_keypoints_1; Mat img_keypoints_2; |
||||
|
||||
drawKeypoints( img_1, keypoints_1, img_keypoints_1, Scalar::all(-1), DrawMatchesFlags::DEFAULT );
|
||||
drawKeypoints( img_2, keypoints_2, img_keypoints_2, Scalar::all(-1), DrawMatchesFlags::DEFAULT );
|
||||
|
||||
//-- Show detected (drawn) keypoints
|
||||
imshow("Keypoints 1", img_keypoints_1 ); |
||||
imshow("Keypoints 2", img_keypoints_2 ); |
||||
|
||||
waitKey(0); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
/**
|
||||
* @function readme |
||||
*/ |
||||
void readme() |
||||
{ std::cout << " Usage: ./SURF_detector <img1> <img2>" << std::endl; } |
Loading…
Reference in new issue