Merge pull request #1015 from SpecLad:merge-2.4

2013-06-21 17:38:04 +04:00
parent 84639e444b 13cd0a0502
commit b20c9ad2d1
52 changed files with 1405 additions and 378 deletions
--- a/samples/cpp/tutorial_code/features2D/SURF_FlannMatcher.cpp
+++ b/samples/cpp/tutorial_code/features2D/SURF_FlannMatcher.cpp
@@ -71,7 +71,7 @@ int main( int argc, char** argv )
  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 <= 2*min_dist )
    { good_matches.push_back( matches[i]); }
  }