Skip to content

O
opencv
Commit a8a92783 authored by Alexey Spizhevoy's avatar Alexey Spizhevoy
Browse files
Options

updated matches checking in opencv_stitching

parent bb8198ab
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/stitching/matchers.cpp
View file @ a8a92783
...@@ -311,7 +311,7 @@ namespace ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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));
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment