modified features2d interface; added algorithmic test for DescriptorMatcher; added sample on matching to many images

2010-10-29 08:44:42 +00:00
parent 0d3809d0b1
commit 69e329c9fd
16 changed files with 1786 additions and 920 deletions
--- a/samples/cpp/matcher_simple.cpp
+++ b/samples/cpp/matcher_simple.cpp
@@ -35,9 +35,8 @@ int main(int argc, char** argv)

 	// matching descriptors
 	BruteForceMatcher<L2<float> > matcher;
-	vector<int> matches;
-	matcher.add(descriptors2);
-	matcher.match(descriptors1, matches);
+    vector<DMatch> matches;
+    matcher.match(descriptors1, descriptors2, matches);

 	// drawing the results
 	namedWindow("matches", 1);