Merge pull request #1881 from pentschev:defaultNorm_master

2013-12-17 13:53:59 +04:00
parent 52a785e95a 6f3163f62d
commit e49b8dee40
29 changed files with 94 additions and 26 deletions
--- a/samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp
+++ b/samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp
@@ -49,7 +49,7 @@ int main( int argc, char** argv )
  extractor.compute( img_2, keypoints_2, descriptors_2 );

  //-- Step 3: Matching descriptor vectors with a brute force matcher
-  BFMatcher matcher(NORM_L2);
+  BFMatcher matcher(extractor.defaultNorm());
  std::vector< DMatch > matches;
  matcher.match( descriptors_1, descriptors_2, matches );