From d51d05fc448b456c6191257b90055f93071ec88e Mon Sep 17 00:00:00 2001 From: Gurpinder Singh Sandhu Date: Thu, 4 Apr 2013 23:12:18 +0530 Subject: [PATCH 1/2] Feature description tutorials made in sync with sample code sample code : https://github.com/Itseez/opencv/blob/master/samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp Bug #2888 --- .../features2d/feature_description/feature_description.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tutorials/features2d/feature_description/feature_description.rst b/doc/tutorials/features2d/feature_description/feature_description.rst index fe9b7cdbff..6f364e03e1 100644 --- a/doc/tutorials/features2d/feature_description/feature_description.rst +++ b/doc/tutorials/features2d/feature_description/feature_description.rst @@ -69,7 +69,7 @@ This tutorial code's is shown lines below. You can also download it from `here < extractor.compute( img_2, keypoints_2, descriptors_2 ); //-- Step 3: Matching descriptor vectors with a brute force matcher - BruteForceMatcher< L2 > matcher; + BFMatcher matcher(NORM_L2); std::vector< DMatch > matches; matcher.match( descriptors_1, descriptors_2, matches ); From 87b84a41971b2bb1d33ef65a4d1bf8f4e7163860 Mon Sep 17 00:00:00 2001 From: Gurpinder Singh Sandhu Date: Thu, 4 Apr 2013 23:13:03 +0530 Subject: [PATCH 2/2] another update --- .../features2d/feature_description/feature_description.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tutorials/features2d/feature_description/feature_description.rst b/doc/tutorials/features2d/feature_description/feature_description.rst index 6f364e03e1..0329cc4641 100644 --- a/doc/tutorials/features2d/feature_description/feature_description.rst +++ b/doc/tutorials/features2d/feature_description/feature_description.rst @@ -13,7 +13,7 @@ In this tutorial you will learn how to: * Use the :descriptor_extractor:`DescriptorExtractor<>` interface in order to find the feature vector correspondent to the keypoints. Specifically: * Use :surf_descriptor_extractor:`SurfDescriptorExtractor<>` and its function :descriptor_extractor:`compute<>` to perform the required calculations. - * Use a :brute_force_matcher:`BruteForceMatcher<>` to match the features vector + * Use a :brute_force_matcher:`BFMatcher<>` to match the features vector * Use the function :draw_matches:`drawMatches<>` to draw the detected matches.