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

2020-04-24 18:32:18 +00:00
parent 15b948d109 8d05dab32c
commit 152e6476d9
30 changed files with 1658 additions and 44 deletions
@@ -29,7 +29,7 @@ FLANN_INDEX_LSH    = 6
 def init_feature(name):
    chunks = name.split('-')
    if chunks[0] == 'sift':
-        detector = cv.xfeatures2d.SIFT_create()
+        detector = cv.SIFT_create()
        norm = cv.NORM_L2
    elif chunks[0] == 'surf':
        detector = cv.xfeatures2d.SURF_create(800)