Merge pull request #10613 from csukuangfj:fix-10612

b067e0ca · Alexander Alekhin · 85e133a0 · 2b635edc · b067e0ca
Commit b067e0ca authored Jan 17, 2018 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

ptsetreg.cpp modules/calib3d/src/ptsetreg.cpp +3 -3

No files found.
--- a/modules/calib3d/src/ptsetreg.cpp
+++ b/modules/calib3d/src/ptsetreg.cpp
@@ -591,12 +591,12 @@ public:
        }
    }
-    bool checkSubset( InputArray _ms1, InputArray, int count ) const
+    bool checkSubset( InputArray _ms1, InputArray _ms2, int count ) const
    {
        Mat ms1 = _ms1.getMat();
+        Mat ms2 = _ms2.getMat();
        // check collinearity and also check that points are too close
-        // only ms1 affects actual estimation stability
+        return !haveCollinearPoints(ms1, count) && !haveCollinearPoints(ms2, count);
-        return !haveCollinearPoints(ms1, count);
    }
 };