From e96de8821cbeaa28ebfea2035c52a70642c018ab Mon Sep 17 00:00:00 2001 From: StevenPuttemans Date: Mon, 12 May 2014 15:26:56 +0200 Subject: [PATCH] bug 2740 added fix --- modules/nonfree/doc/feature_detection.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/nonfree/doc/feature_detection.rst b/modules/nonfree/doc/feature_detection.rst index 190c9f8..fec396a 100644 --- 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) -- 2.7.4