generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed few errors in documentation backporting

Browse Source
This commit is contained in:
Andrey Kamaev 2012-05-30 11:20:55 +00:00
parent 81a5988015
commit 4ddcc31edc
4 changed files with 4 additions and 6 deletions

2
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

4
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<Mat>& 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<Mat>& mv )
.. ocv:pyfunction:: cv2.split(m[, mv]) -> mv

2
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<class Distance> 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. ::

2
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`` .