Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
ff7b604a
Commit
ff7b604a
authored
Feb 19, 2013
by
Andrey Kamaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix several inconsistent declarations identified by check_doc2 script
parent
2bbb777d
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
18 deletions
+19
-18
basic_structures.rst
modules/core/doc/basic_structures.rst
+9
-8
utility_and_system_functions_and_macros.rst
modules/core/doc/utility_and_system_functions_and_macros.rst
+2
-2
common_interfaces_of_feature_detectors.rst
...features2d/doc/common_interfaces_of_feature_detectors.rst
+1
-1
data_structures.rst
modules/gpu/doc/data_structures.rst
+3
-3
boosting.rst
modules/ml/doc/boosting.rst
+4
-4
No files found.
modules/core/doc/basic_structures.rst
View file @
ff7b604a
...
...
@@ -2064,10 +2064,11 @@ SparseMat::SparseMat
Various SparseMat constructors.
.. ocv:function:: SparseMat::SparseMat()
.. ocv:function:: SparseMat::SparseMat(int dims, const int* _sizes, int _type)
.. ocv:function:: SparseMat::SparseMat(const SparseMat& m)
.. ocv:function:: SparseMat::SparseMat(const Mat& m, bool try1d=false)
.. ocv:function:: SparseMat::SparseMat(const CvSparseMat* m)
.. ocv:function:: SparseMat::SparseMat( int dims, const int* _sizes, int _type )
.. ocv:function:: SparseMat::SparseMat( const SparseMat& m )
.. ocv:function:: SparseMat::SparseMat( const Mat& m )
.. ocv:function:: SparseMat::SparseMat( const CvSparseMat* m )
:param m: Source matrix for copy constructor. If m is dense matrix (ocv:class:`Mat`) then it will be converted to sparse representation.
:param dims: Array dimensionality.
...
...
@@ -2081,12 +2082,12 @@ SparseMat object destructor.
.. ocv:function:: SparseMat::~SparseMat()
SparseMat::operator
=
--------------------
-
SparseMat::operator=
--------------------
Provides sparse matrix assignment operators.
.. ocv:function:: SparseMat& SparseMat::operator
=
(const SparseMat& m)
.. ocv:function:: SparseMat& SparseMat::operator
=
(const Mat& m)
.. ocv:function:: SparseMat& SparseMat::operator
=
(const SparseMat& m)
.. ocv:function:: SparseMat& SparseMat::operator
=
(const Mat& m)
The last variant is equivalent to the corresponding constructor with try1d=false.
...
...
modules/core/doc/utility_and_system_functions_and_macros.rst
View file @
ff7b604a
...
...
@@ -444,9 +444,9 @@ If ``threads == 0``, OpenCV will disable threading optimizations and run all it'
functions sequentially. Passing ``threads < 0`` will reset threads number to system default.
This function must be called outside of parallel region.
.. ocv:function:: void setNumThreads(int threads)
.. ocv:function:: void setNumThreads(int
n
threads)
:param threads: Number of threads used by OpenCV.
:param
n
threads: Number of threads used by OpenCV.
OpenCV will try to run it's functions with specified threads number, but
some behaviour differs from framework:
...
...
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
View file @
ff7b604a
...
...
@@ -531,7 +531,7 @@ StarAdjuster
SurfAdjuster
------------
.. ocv:class:: SurfAdjuster: public AdjusterAdapter
.. ocv:class:: SurfAdjuster
: public AdjusterAdapter
:ocv:class:`AdjusterAdapter` for ``SurfFeatureDetector``. ::
...
...
modules/gpu/doc/data_structures.rst
View file @
ff7b604a
...
...
@@ -352,9 +352,9 @@ gpu::Stream::enqueueMemSet
--------------------------
Initializes or sets device memory to a value.
.. ocv:function:: void gpu::Stream::enqueueMemSet(
const GpuMat& src, Scalar val
)
.. ocv:function:: void gpu::Stream::enqueueMemSet(
GpuMat& src, Scalar val
)
.. ocv:function:: void gpu::Stream::enqueueMemSet(
const GpuMat& src, Scalar val, const GpuMat& mask
)
.. ocv:function:: void gpu::Stream::enqueueMemSet(
GpuMat& src, Scalar val, const GpuMat& mask
)
...
...
@@ -362,7 +362,7 @@ gpu::Stream::enqueueConvert
---------------------------
Converts matrix type, ex from float to uchar depending on type.
.. ocv:function:: void gpu::Stream::enqueueConvert(
const GpuMat& src, GpuMat& dst, int type, double a = 1, double b = 0
)
.. ocv:function:: void gpu::Stream::enqueueConvert(
const GpuMat& src, GpuMat& dst, int dtype, double a=1, double b=0
)
...
...
modules/ml/doc/boosting.rst
View file @
ff7b604a
...
...
@@ -169,11 +169,11 @@ CvBoost::predict
----------------
Predicts a response for an input sample.
.. ocv:function:: float CvBoost::predict(
const Mat& sample, const Mat& missing=Mat(), const Range& slice=Range::all(), bool raw_mode=false, bool return_s
um=false ) const
.. ocv:function:: float CvBoost::predict(
const cv::Mat& sample, const cv::Mat& missing=Mat(), const cv::Range& slice=Range::all(), bool rawMode=false, bool returnS
um=false ) const
.. ocv:function:: float CvBoost::predict( const CvMat* sample, const CvMat* missing=0, CvMat* weak_responses=0, CvSlice slice=CV_WHOLE_SEQ, bool raw_mode=false, bool return_sum=false ) const
.. ocv:pyfunction:: cv2.Boost.predict(sample[, missing[, slice[, raw
_mode[, return_s
um]]]]) -> retval
.. ocv:pyfunction:: cv2.Boost.predict(sample[, missing[, slice[, raw
Mode[, returnS
um]]]]) -> retval
:param sample: Input sample.
...
...
@@ -183,9 +183,9 @@ Predicts a response for an input sample.
:param slice: Continuous subset of the sequence of weak classifiers to be used for prediction. By default, all the weak classifiers are used.
:param raw
_m
ode: Normally, it should be set to ``false``.
:param raw
M
ode: Normally, it should be set to ``false``.
:param return
_s
um: If ``true`` then return sum of votes instead of the class label.
:param return
S
um: If ``true`` then return sum of votes instead of the class label.
The method runs the sample through the trees in the ensemble and returns the output class label based on the weighted voting.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment