Fix GMSMatcher crash when -1 value is assigned by getGridIndexLeft() in assignMatchPairs().

catree · catree · commit 70664ccfa89b · 2020-03-08T21:12:18.000+01:00
diff --git a/modules/xfeatures2d/src/gms.cpp b/modules/xfeatures2d/src/gms.cpp
@@ -370,7 +370,7 @@ int GMSMatcher::run(const int rotationType)
         // Mark inliers
         for (size_t i = 0; i < mNumberMatches; i++)
         {
-            if (mCellPairs[mvMatchPairs[i].first] == mvMatchPairs[i].second)
+            if (mvMatchPairs[i].first >= 0 && mCellPairs[mvMatchPairs[i].first] == mvMatchPairs[i].second)
                 mvbInlierMask[i] = true;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ int GMSMatcher::run(const int rotationType)`
`370`	`370`	`// Mark inliers`
`371`	`371`	`for (size_t i = 0; i < mNumberMatches; i++)`
`372`	`372`	`{`
`373`		`- if (mCellPairs[mvMatchPairs[i].first] == mvMatchPairs[i].second)`
	`373`	`+ if (mvMatchPairs[i].first >= 0 && mCellPairs[mvMatchPairs[i].first] == mvMatchPairs[i].second)`
`374`	`374`	`mvbInlierMask[i] = true;`
`375`	`375`	`}`
`376`	`376`	`}`