Skip to content

O
opencv
Commit 2cf6cea9 authored by Roman Donchenko's avatar Roman Donchenko Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #2730 from StevenPuttemans:bug_2740

parents c607dadc e96de882
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
modules/nonfree/doc/feature_detection.rst
View file @ 2cf6cea9
...@@ -110,6 +110,8 @@ Detects keypoints and computes SURF descriptors for them. ...@@ -110,6 +110,8 @@ Detects keypoints and computes SURF descriptors for them.
.. ocv:pyfunction:: cv2.SURF.detect(image[, mask]) -> keypoints .. 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: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) .. ocv:pyoldfunction:: cv.ExtractSURF(image, mask, storage, params)-> (keypoints, descriptors)
......
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