Commit da0188ac authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

Merge pull request #8245 from oulenz:patch-1

parents e4377e7c 28cfb074
...@@ -86,7 +86,7 @@ kp1, des1 = sift.detectAndCompute(img1,None) ...@@ -86,7 +86,7 @@ kp1, des1 = sift.detectAndCompute(img1,None)
kp2, des2 = sift.detectAndCompute(img2,None) kp2, des2 = sift.detectAndCompute(img2,None)
# FLANN parameters # FLANN parameters
FLANN_INDEX_KDTREE = 0 FLANN_INDEX_KDTREE = 1
index_params = dict(algorithm = FLANN_INDEX_KDTREE, trees = 5) index_params = dict(algorithm = FLANN_INDEX_KDTREE, trees = 5)
search_params = dict(checks=50) search_params = dict(checks=50)
......
...@@ -50,7 +50,7 @@ sift = cv2.xfeatures2d.SIFT_create() ...@@ -50,7 +50,7 @@ sift = cv2.xfeatures2d.SIFT_create()
kp1, des1 = sift.detectAndCompute(img1,None) kp1, des1 = sift.detectAndCompute(img1,None)
kp2, des2 = sift.detectAndCompute(img2,None) kp2, des2 = sift.detectAndCompute(img2,None)
FLANN_INDEX_KDTREE = 0 FLANN_INDEX_KDTREE = 1
index_params = dict(algorithm = FLANN_INDEX_KDTREE, trees = 5) index_params = dict(algorithm = FLANN_INDEX_KDTREE, trees = 5)
search_params = dict(checks = 50) search_params = dict(checks = 50)
......
...@@ -148,11 +148,13 @@ its related parameters etc. First one is IndexParams. For various algorithms, th ...@@ -148,11 +148,13 @@ its related parameters etc. First one is IndexParams. For various algorithms, th
passed is explained in FLANN docs. As a summary, for algorithms like SIFT, SURF etc. you can pass passed is explained in FLANN docs. As a summary, for algorithms like SIFT, SURF etc. you can pass
following: following:
@code{.py} @code{.py}
FLANN_INDEX_KDTREE = 1
index_params = dict(algorithm = FLANN_INDEX_KDTREE, trees = 5) index_params = dict(algorithm = FLANN_INDEX_KDTREE, trees = 5)
@endcode @endcode
While using ORB, you can pass the following. The commented values are recommended as per the docs, While using ORB, you can pass the following. The commented values are recommended as per the docs,
but it didn't provide required results in some cases. Other values worked fine.: but it didn't provide required results in some cases. Other values worked fine.:
@code{.py} @code{.py}
FLANN_INDEX_LSH = 6
index_params= dict(algorithm = FLANN_INDEX_LSH, index_params= dict(algorithm = FLANN_INDEX_LSH,
table_number = 6, # 12 table_number = 6, # 12
key_size = 12, # 20 key_size = 12, # 20
...@@ -179,7 +181,7 @@ kp1, des1 = sift.detectAndCompute(img1,None) ...@@ -179,7 +181,7 @@ kp1, des1 = sift.detectAndCompute(img1,None)
kp2, des2 = sift.detectAndCompute(img2,None) kp2, des2 = sift.detectAndCompute(img2,None)
# FLANN parameters # FLANN parameters
FLANN_INDEX_KDTREE = 0 FLANN_INDEX_KDTREE = 1
index_params = dict(algorithm = FLANN_INDEX_KDTREE, trees = 5) index_params = dict(algorithm = FLANN_INDEX_KDTREE, trees = 5)
search_params = dict(checks=50) # or pass empty dictionary search_params = dict(checks=50) # or pass empty dictionary
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment