Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2021-12-24 16:35:47 +00:00
parent 9777fbacf6 655d381ef3
commit 217fea9667
26 changed files with 804 additions and 377 deletions
@@ -86,6 +86,7 @@ def explore_match(win, img1, img2, kp_pairs, status = None, H = None):

    if status is None:
        status = np.ones(len(kp_pairs), np.bool_)
+        status = status.reshape((len(kp_pairs), 1))
    p1, p2 = [], []  # python 2 / python 3 change of zip unpacking
    for kpp in kp_pairs:
        p1.append(np.int32(kpp[0].pt))