From a8a9278391595485dde1e9038e3ead1e76569431 Mon Sep 17 00:00:00 2001 From: Alexey Spizhevoy Date: Fri, 10 Jun 2011 05:38:52 +0000 Subject: [PATCH] updated matches checking in opencv_stitching --- modules/stitching/matchers.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/stitching/matchers.cpp b/modules/stitching/matchers.cpp index 69262eb..07c8fb9 100644 --- a/modules/stitching/matchers.cpp +++ b/modules/stitching/matchers.cpp @@ -311,7 +311,7 @@ namespace const DMatch& m1 = pair_matches[i][1]; if (m0.distance < (1.f - match_conf_) * m1.distance) { - //matches_info.matches.push_back(m0); + matches_info.matches.push_back(m0); matches.insert(make_pair(m0.queryIdx, m0.trainIdx)); } } @@ -326,7 +326,7 @@ namespace const DMatch& m0 = pair_matches[i][0]; const DMatch& m1 = pair_matches[i][1]; if (m0.distance < (1.f - match_conf_) * m1.distance) - if (matches.find(make_pair(m0.trainIdx, m0.queryIdx)) != matches.end()) + if (matches.find(make_pair(m0.trainIdx, m0.queryIdx)) == matches.end()) matches_info.matches.push_back(DMatch(m0.trainIdx, m0.queryIdx, m0.distance)); } } @@ -352,7 +352,7 @@ namespace const DMatch& m1 = pair_matches[i][1]; if (m0.distance < (1.f - match_conf_) * m1.distance) { - //matches_info.matches.push_back(m0); + matches_info.matches.push_back(m0); matches.insert(make_pair(m0.queryIdx, m0.trainIdx)); } } @@ -368,7 +368,7 @@ namespace const DMatch& m0 = pair_matches[i][0]; const DMatch& m1 = pair_matches[i][1]; if (m0.distance < (1.f - match_conf_) * m1.distance) - if (matches.find(make_pair(m0.trainIdx, m0.queryIdx)) != matches.end()) + if (matches.find(make_pair(m0.trainIdx, m0.queryIdx)) == matches.end()) matches_info.matches.push_back(DMatch(m0.trainIdx, m0.queryIdx, m0.distance)); } } -- 2.7.4