From 9968197ebf16ed55671e8f32e8295fdf9affebdb Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Sat, 25 Jan 2014 14:44:28 +0400 Subject: [PATCH] doc fix --- .../doc/common_interfaces_of_descriptor_matchers.rst | 10 +++++----- .../doc/common_interfaces_of_feature_detectors.rst | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst b/modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst index ea9e13f..9350f6f 100644 --- a/modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst +++ b/modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst @@ -41,7 +41,7 @@ with an image set. :: * Group of methods to match descriptors from an image pair. */ void match( InputArray queryDescriptors, InputArray trainDescriptors, - vector& matches, InputArray mask=Mat() ) const; + vector& matches, InputArray mask=noArray() ) const; void knnMatch( InputArray queryDescriptors, InputArray trainDescriptors, vector >& matches, int k, InputArray mask=Mat(), bool compactResult=false ) const; @@ -52,7 +52,7 @@ with an image set. :: * Group of methods to match descriptors from one image to an image set. */ void match( InputArray queryDescriptors, vector& matches, - const vector& masks=vector() ); + const vector& masks=noArray() ); void knnMatch( InputArray queryDescriptors, vector >& matches, int k, const vector& masks=vector(), bool compactResult=false ); @@ -131,7 +131,7 @@ DescriptorMatcher::match ---------------------------- Finds the best match for each descriptor from a query set. -.. ocv:function:: void DescriptorMatcher::match( InputArray queryDescriptors, InputArray trainDescriptors, vector& matches, InputArray mask=Mat() ) const +.. ocv:function:: void DescriptorMatcher::match( InputArray queryDescriptors, InputArray trainDescriptors, vector& matches, InputArray mask=noArray() ) const .. ocv:function:: void DescriptorMatcher::match(InputArray queryDescriptors, vector& matches, const vector& masks=vector() ) @@ -153,7 +153,7 @@ DescriptorMatcher::knnMatch ------------------------------- Finds the k best matches for each descriptor from a query set. -.. ocv:function:: void DescriptorMatcher::knnMatch(InputArray queryDescriptors, InputArray trainDescriptors, vector >& matches, int k, InputArray mask=Mat(), bool compactResult=false ) const +.. ocv:function:: void DescriptorMatcher::knnMatch(InputArray queryDescriptors, InputArray trainDescriptors, vector >& matches, int k, InputArray mask=noArray(), bool compactResult=false ) const .. ocv:function:: void DescriptorMatcher::knnMatch( InputArray queryDescriptors, vector >& matches, int k, const vector& masks=vector(), bool compactResult=false ) @@ -179,7 +179,7 @@ DescriptorMatcher::radiusMatch ---------------------------------- For each query descriptor, finds the training descriptors not farther than the specified distance. -.. ocv:function:: void DescriptorMatcher::radiusMatch( InputArray queryDescriptors, InputArray trainDescriptors, vector >& matches, float maxDistance, InputArray mask=Mat(), bool compactResult=false ) const +.. ocv:function:: void DescriptorMatcher::radiusMatch( InputArray queryDescriptors, InputArray trainDescriptors, vector >& matches, float maxDistance, InputArray mask=noArray(), bool compactResult=false ) const .. ocv:function:: void DescriptorMatcher::radiusMatch( InputArray queryDescriptors, vector >& matches, float maxDistance, const vector& masks=vector(), bool compactResult=false ) diff --git a/modules/features2d/doc/common_interfaces_of_feature_detectors.rst b/modules/features2d/doc/common_interfaces_of_feature_detectors.rst index 434585d..62a9907 100644 --- a/modules/features2d/doc/common_interfaces_of_feature_detectors.rst +++ b/modules/features2d/doc/common_interfaces_of_feature_detectors.rst @@ -23,12 +23,12 @@ Abstract base class for 2D image feature detectors. :: public: virtual ~FeatureDetector(); - void detect( const Mat& image, vector& keypoints, - const Mat& mask=Mat() ) const; + void detect( InputArray image, vector& keypoints, + InputArray mask=noArray() ) const; - void detect( const vector& images, + void detect( InputArrayOfArrays images, vector >& keypoints, - const vector& masks=vector() ) const; + InputArrayOfArrays masks=noArray() ) const; virtual void read(const FileNode&); virtual void write(FileStorage&) const; @@ -43,9 +43,9 @@ FeatureDetector::detect --------------------------- Detects keypoints in an image (first variant) or image set (second variant). -.. ocv:function:: void FeatureDetector::detect( const Mat& image, vector& keypoints, const Mat& mask=Mat() ) const +.. ocv:function:: void FeatureDetector::detect( InputArray image, vector& keypoints, InputArray mask=noArray() ) const -.. ocv:function:: void FeatureDetector::detect( const vector& images, vector >& keypoints, const vector& masks=vector() ) const +.. ocv:function:: void FeatureDetector::detect( InputArrayOfArrays images, vector >& keypoints, InputArrayOfArrays masks=noArray() ) const .. ocv:pyfunction:: cv2.FeatureDetector_create.detect(image[, mask]) -> keypoints -- 2.7.4