Merge pull request #2730 from StevenPuttemans:bug_2740

11 years ago · 2cf6cea90f
parent c607dadc49 e96de8821c
commit 2cf6cea90f
1 changed files with 2 additions and 0 deletions
--- a/modules/nonfree/doc/feature_detection.rst
+++ b/modules/nonfree/doc/feature_detection.rst
@ -110,6 +110,8 @@ Detects keypoints and computes SURF descriptors for them.

 .. ocv:pyfunction:: cv2.SURF.detect(image[, mask]) -> keypoints

+.. ocv:pyfunction:: cv2.SURF.detectAndCompute(image[, mask]) -> keypoints, descriptors
+
 .. ocv:cfunction:: void cvExtractSURF( const CvArr* image, const CvArr* mask, CvSeq** keypoints, CvSeq** descriptors, CvMemStorage* storage, CvSURFParams params )

 .. ocv:pyoldfunction:: cv.ExtractSURF(image, mask, storage, params)-> (keypoints, descriptors)