From b8de81749c3071b98174e24b0a5df950f1140cc9 Mon Sep 17 00:00:00 2001 From: moodoki Date: Thu, 14 Nov 2013 00:22:20 +0800 Subject: [PATCH 1/2] Slight modification to example code for FLANN matcher with comment on #3344 --- .../feature_flann_matcher/feature_flann_matcher.rst | 6 ++++-- samples/cpp/tutorial_code/features2D/SURF_FlannMatcher.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst b/doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst index 3bf757fc0..153fca2e7 100644 --- a/doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst +++ b/doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst @@ -81,12 +81,14 @@ This tutorial code's is shown lines below. You can also download it from `here < printf("-- Max dist : %f \n", max_dist ); printf("-- Min dist : %f \n", min_dist ); - //-- Draw only "good" matches (i.e. whose distance is less than 2*min_dist ) + //-- Draw only "good" matches (i.e. whose distance is less than 2*min_dist, + //-- or a small arbitary value ( 0.02 ) in the event that min_dist is very + //-- small) //-- PS.- radiusMatch can also be used here. std::vector< DMatch > good_matches; for( int i = 0; i < descriptors_1.rows; i++ ) - { if( matches[i].distance <= 2*min_dist ) + { if( matches[i].distance <= max(2*min_dist, 0.02) ) { good_matches.push_back( matches[i]); } } diff --git a/samples/cpp/tutorial_code/features2D/SURF_FlannMatcher.cpp b/samples/cpp/tutorial_code/features2D/SURF_FlannMatcher.cpp index ead7fd718..09346309e 100644 --- a/samples/cpp/tutorial_code/features2D/SURF_FlannMatcher.cpp +++ b/samples/cpp/tutorial_code/features2D/SURF_FlannMatcher.cpp @@ -65,12 +65,14 @@ int main( int argc, char** argv ) printf("-- Max dist : %f \n", max_dist ); printf("-- Min dist : %f \n", min_dist ); - //-- Draw only "good" matches (i.e. whose distance is less than 2*min_dist ) + //-- Draw only "good" matches (i.e. whose distance is less than 2*min_dist, + //-- or a small arbitary value ( 0.02 ) in the event that min_dist is very + //-- small) //-- PS.- radiusMatch can also be used here. std::vector< DMatch > good_matches; for( int i = 0; i < descriptors_1.rows; i++ ) - { if( matches[i].distance <= 2*min_dist ) + { if( matches[i].distance <= max(2*min_dist, 0.02) ) { good_matches.push_back( matches[i]); } } From cebf109d3950be362c590e7602d02240be08054b Mon Sep 17 00:00:00 2001 From: moodoki Date: Fri, 15 Nov 2013 00:27:07 +0800 Subject: [PATCH 2/2] Replaced code in .rst file with literalinclude as suggested --- .../feature_flann_matcher.rst | 93 +------------------ 1 file changed, 2 insertions(+), 91 deletions(-) diff --git a/doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst b/doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst index 153fca2e7..1257f1c1b 100644 --- a/doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst +++ b/doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst @@ -21,97 +21,8 @@ Code This tutorial code's is shown lines below. You can also download it from `here `_ -.. code-block:: cpp - - #include - #include - #include "opencv2/core/core.hpp" - #include "opencv2/features2d/features2d.hpp" - #include "opencv2/highgui/highgui.hpp" - #include "opencv2/nonfree/nonfree.hpp" - - using namespace cv; - - void readme(); - - /** @function main */ - 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 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 using FLANN matcher - FlannBasedMatcher matcher; - std::vector< DMatch > matches; - matcher.match( descriptors_1, descriptors_2, matches ); - - double max_dist = 0; double min_dist = 100; - - //-- Quick calculation of max and min distances between keypoints - for( int i = 0; i < descriptors_1.rows; i++ ) - { double dist = matches[i].distance; - if( dist < min_dist ) min_dist = dist; - if( dist > max_dist ) max_dist = dist; - } - - printf("-- Max dist : %f \n", max_dist ); - printf("-- Min dist : %f \n", min_dist ); - - //-- Draw only "good" matches (i.e. whose distance is less than 2*min_dist, - //-- or a small arbitary value ( 0.02 ) in the event that min_dist is very - //-- small) - //-- PS.- radiusMatch can also be used here. - std::vector< DMatch > good_matches; - - for( int i = 0; i < descriptors_1.rows; i++ ) - { if( matches[i].distance <= max(2*min_dist, 0.02) ) - { good_matches.push_back( matches[i]); } - } - - //-- Draw only "good" matches - Mat img_matches; - drawMatches( img_1, keypoints_1, img_2, keypoints_2, - good_matches, img_matches, Scalar::all(-1), Scalar::all(-1), - vector(), DrawMatchesFlags::NOT_DRAW_SINGLE_POINTS ); - - //-- Show detected matches - imshow( "Good Matches", img_matches ); - - for( int i = 0; i < good_matches.size(); i++ ) - { printf( "-- Good Match [%d] Keypoint 1: %d -- Keypoint 2: %d \n", i, good_matches[i].queryIdx, good_matches[i].trainIdx ); } - - waitKey(0); - - return 0; - } - - /** @function readme */ - void readme() - { std::cout << " Usage: ./SURF_FlannMatcher " << std::endl; } +.. literalinclude:: ../../../../samples/cpp/tutorial_code/features2D/SURF_FlannMatcher.cpp + :language: cpp Explanation ============