diff --git a/doc/check_docs2.py b/doc/check_docs2.py index 12696b36c0f28a1e6a1b814d3c502ab3cb10b33a..711d358bd2fbf5a1e262a971687e5ca76e1bc9e4 100644 --- a/doc/check_docs2.py +++ b/doc/check_docs2.py @@ -31,7 +31,7 @@ doc_signatures_whitelist = [ # templates "Matx", "Vec", "SparseMat_", "Scalar_", "Mat_", "Ptr", "Size_", "Point_", "Rect_", "Point3_", "DataType", "detail::RotationWarperBase", "flann::Index_", "CalonderDescriptorExtractor", -"gpu::DevMem2D_", "gpu::PtrStep_", "gpu::PtrElemStep_", +"gpu::DevMem2D_", "gpu::PtrStep_", "gpu::PtrElemStep_", "gpu::BruteForceMatcher_GPU", # black boxes "CvArr", "CvFileStorage", # other diff --git a/modules/core/doc/operations_on_arrays.rst b/modules/core/doc/operations_on_arrays.rst index db5f49f78d5f80ff1c8c96e3b73b56d080058ca1..ca219d87eef2e1cb524dbb7e0e11db830d769f59 100644 --- a/modules/core/doc/operations_on_arrays.rst +++ b/modules/core/doc/operations_on_arrays.rst @@ -1720,7 +1720,7 @@ Composes a multi-channel array from several single-channel arrays. .. ocv:function:: void merge(const Mat* mv, size_t count, OutputArray dst) -.. ocv:function:: void merge( InputArrayOfArrays mv, OutputArray dst ) +.. ocv:function:: void merge( const vector& mv, OutputArray dst ) .. ocv:pyfunction:: cv2.merge(mv[, dst]) -> dst @@ -3040,7 +3040,7 @@ Divides a multi-channel array into several single-channel arrays. .. ocv:function:: void split( const Mat& src, Mat* mvbegin ) -.. ocv:function:: void split( InputArray m, OutputArrayOfArrays mv ) +.. ocv:function:: void split( const Mat& m, vector& mv ) .. ocv:pyfunction:: cv2.split(m[, mv]) -> mv diff --git a/modules/gpu/doc/feature_detection_and_description.rst b/modules/gpu/doc/feature_detection_and_description.rst index db1fb9a0a91f9c47fd829a099c596e5bba3fd2d2..2c2bef58070d64473441224d701d3bc089caddf5 100644 --- a/modules/gpu/doc/feature_detection_and_description.rst +++ b/modules/gpu/doc/feature_detection_and_description.rst @@ -372,7 +372,7 @@ Releases inner buffer memory. gpu::BruteForceMatcher_GPU -------------------------- -.. ocv:class:: gpu::BruteForceMatcher_GPU +.. ocv:class:: template gpu::BruteForceMatcher_GPU Brute-force descriptor matcher. For each descriptor in the first set, this matcher finds the closest descriptor in the second set by trying each one. This descriptor matcher supports masking permissible matches between descriptor sets. :: diff --git a/modules/gpu/doc/per_element_operations.rst b/modules/gpu/doc/per_element_operations.rst index 2670ba32333a227ca5847a4b21bc7c75c6edbea9..a59875e6467c1d35f23fba7539cd6b9748fea154 100644 --- a/modules/gpu/doc/per_element_operations.rst +++ b/modules/gpu/doc/per_element_operations.rst @@ -276,8 +276,6 @@ Compares elements of two matrices. .. ocv:function:: void gpu::compare( const GpuMat& a, const GpuMat& b, GpuMat& c, int cmpop, Stream& stream=Stream::Null() ) -.. ocv:function:: void gpu::compare(const GpuMat& a, Scalar sc, GpuMat& c, int cmpop, Stream& stream = Stream::Null()) - :param a: First source matrix. :param b: Second source matrix with the same size and type as ``a`` .