updated matches checking in opencv_stitching
authorAlexey Spizhevoy <no@email>
Fri, 10 Jun 2011 05:38:52 +0000 (05:38 +0000)
committerAlexey Spizhevoy <no@email>
Fri, 10 Jun 2011 05:38:52 +0000 (05:38 +0000)
modules/stitching/matchers.cpp

index 69262eb..07c8fb9 100644 (file)
@@ -311,7 +311,7 @@ namespace
             const DMatch& m1 = pair_matches[i][1];\r
             if (m0.distance < (1.f - match_conf_) * m1.distance)\r
             {\r
-                //matches_info.matches.push_back(m0);\r
+                matches_info.matches.push_back(m0);\r
                 matches.insert(make_pair(m0.queryIdx, m0.trainIdx));\r
             }\r
         }\r
@@ -326,7 +326,7 @@ namespace
             const DMatch& m0 = pair_matches[i][0];\r
             const DMatch& m1 = pair_matches[i][1];\r
             if (m0.distance < (1.f - match_conf_) * m1.distance)\r
-                if (matches.find(make_pair(m0.trainIdx, m0.queryIdx)) != matches.end())\r
+                if (matches.find(make_pair(m0.trainIdx, m0.queryIdx)) == matches.end())\r
                     matches_info.matches.push_back(DMatch(m0.trainIdx, m0.queryIdx, m0.distance));\r
         }\r
     }\r
@@ -352,7 +352,7 @@ namespace
             const DMatch& m1 = pair_matches[i][1];\r
             if (m0.distance < (1.f - match_conf_) * m1.distance)\r
             {\r
-                //matches_info.matches.push_back(m0);\r
+                matches_info.matches.push_back(m0);\r
                 matches.insert(make_pair(m0.queryIdx, m0.trainIdx));\r
             }\r
         }\r
@@ -368,7 +368,7 @@ namespace
             const DMatch& m0 = pair_matches[i][0];\r
             const DMatch& m1 = pair_matches[i][1];\r
             if (m0.distance < (1.f - match_conf_) * m1.distance)\r
-                if (matches.find(make_pair(m0.trainIdx, m0.queryIdx)) != matches.end())\r
+                if (matches.find(make_pair(m0.trainIdx, m0.queryIdx)) == matches.end())\r
                     matches_info.matches.push_back(DMatch(m0.trainIdx, m0.queryIdx, m0.distance));\r
         }\r
     }\r