lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.

This commit is contained in:
Vadim Pisarevsky
2012-03-15 14:36:01 +00:00
parent 6300215b94
commit 957e80abbd
99 changed files with 6719 additions and 7240 deletions

View File

@@ -141,7 +141,7 @@ int main(int ac, char ** av)
vector<DMatch> matches;
BruteForceMatcher<Hamming> desc_matcher;
BFMatcher desc_matcher(NORM_HAMMING);
vector<Point2f> train_pts, query_pts;
vector<KeyPoint> train_kpts, query_kpts;