generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated matches checking in opencv_stitching

Browse Source
This commit is contained in:
Alexey Spizhevoy 2011-06-10 05:38:52 +00:00
parent bb8198abfd
commit a8a9278391
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/stitching/matchers.cpp
View File

@ -311,7 +311,7 @@ namespace
const DMatch& m1 = pair_matches[i][1]; const DMatch& m1 = pair_matches[i][1];
if (m0.distance < (1.f - match_conf_) * m1.distance) 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)); matches.insert(make_pair(m0.queryIdx, m0.trainIdx));
} }
} }
@ -326,7 +326,7 @@ namespace
const DMatch& m0 = pair_matches[i][0]; const DMatch& m0 = pair_matches[i][0];
const DMatch& m1 = pair_matches[i][1]; const DMatch& m1 = pair_matches[i][1];
if (m0.distance < (1.f - match_conf_) * m1.distance) 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)); matches_info.matches.push_back(DMatch(m0.trainIdx, m0.queryIdx, m0.distance));
} }
} }
@ -352,7 +352,7 @@ namespace
const DMatch& m1 = pair_matches[i][1]; const DMatch& m1 = pair_matches[i][1];
if (m0.distance < (1.f - match_conf_) * m1.distance) 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)); matches.insert(make_pair(m0.queryIdx, m0.trainIdx));
} }
} }
@ -368,7 +368,7 @@ namespace
const DMatch& m0 = pair_matches[i][0]; const DMatch& m0 = pair_matches[i][0];
const DMatch& m1 = pair_matches[i][1]; const DMatch& m1 = pair_matches[i][1];
if (m0.distance < (1.f - match_conf_) * m1.distance) 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)); matches_info.matches.push_back(DMatch(m0.trainIdx, m0.queryIdx, m0.distance));
} }
} }