generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged the trunk r8595:8668 (except iOS and new gpu functionality)

Browse Source
This commit is contained in:
Andrey Kamaev
2012-06-15 13:21:26 +00:00
parent bd0e0b5800
commit f666bd221f
47 changed files with 457 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/python2/find_obj.py
View File

@@ -76,8 +76,8 @@ if __name__ == '__main__':
img2 = cv2.imread(fn2, 0)
surf = cv2.SURF(1000)
kp1, desc1 = surf.detect(img1, None, False)
kp2, desc2 = surf.detect(img2, None, False)
kp1, desc1 = surf.detectAndCompute(img1, None)
kp2, desc2 = surf.detectAndCompute(img2, None)
desc1.shape = (-1, surf.descriptorSize())
desc2.shape = (-1, surf.descriptorSize())
print 'img1 - %d features, img2 - %d features' % (len(kp1), len(kp2))