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

fixed several typos, including the old ones from ticket #854

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-05-21 20:17:45 +00:00
parent 57e5fabf8f
commit f2a337f990
12 changed files with 80 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
doc/opencv1/c/calib3d_camera_calibration_and_3d_reconstruction.rst
View File

@@ -2152,7 +2152,7 @@ StereoCalibrate
:param cameraMatrix1: The input/output first camera matrix: :math:`\vecthreethree{f_x^{(j)}}{0}{c_x^{(j)}}{0}{f_y^{(j)}}{c_y^{(j)}}{0}{0}{1}` , :math:`j = 0,\, 1` . If any of ``CV_CALIB_USE_INTRINSIC_GUESS`` , ``CV_CALIB_FIX_ASPECT_RATIO`` , ``CV_CALIB_FIX_INTRINSIC`` or ``CV_CALIB_FIX_FOCAL_LENGTH`` are specified, some or all of the matrices' components must be initialized; see the flags description
:param distCoeffs: The input/output vector of distortion coefficients :math:`(k_1, k_2, p_1, p_2[, k_3[, k_4, k_5, k_6]])` of 4, 5 or 8 elements.
:param distCoeffs1: The input/output vector of distortion coefficients :math:`(k_1, k_2, p_1, p_2[, k_3[, k_4, k_5, k_6]])` of 4, 5 or 8 elements.
:param cameraMatrix2: The input/output second camera matrix, as cameraMatrix1.
@@ -2282,25 +2282,20 @@ StereoRectify
Computes rectification transforms for each head of a calibrated stereo camera.
:param cameraMatrix1, cameraMatrix2: The camera matrices :math:`\vecthreethree{f_x^{(j)}}{0}{c_x^{(j)}}{0}{f_y^{(j)}}{c_y^{(j)}}{0}{0}{1}` .
:param cameraMatrix1: The first camera matrix.
:param cameraMatrix2: The second camera matrix.
:param distCoeffs: The input vectors of distortion coefficients :math:`(k_1, k_2, p_1, p_2[, k_3[, k_4, k_5, k_6]])` of 4, 5 or 8 elements each. If the vectors are NULL/empty, the zero distortion coefficients are assumed.
:param distCoeffs1: The first camera distortion parameters.
:param distCoeffs2: The second camera distortion parameters.
:param imageSize: Size of the image used for stereo calibration.
:param imageSize: Size of the image used for stereo calibration.
:param R: The rotation matrix between the 1st and the 2nd cameras' coordinate systems.
:param T: The translation vector between the cameras' coordinate systems.
:param T: The translation vector between the cameras' coordinate systems.
:param R1, R2: The output :math:`3 \times 3` rectification transforms (rotation matrices) for the first and the second cameras, respectively.

4
doc/opencv1/c/core_clustering.rst
View File

@@ -59,7 +59,7 @@ KMeans2
corresponding labels are returned by the function. Basically, the
user can use only the core of the function, set the number of
attempts to 1, initialize labels each time using a custom algorithm
( ``flags=CV_KMEAN_USE_INITIAL_LABELS`` ) and, based on the output compactness
( ``flags=CV_KMEANS_USE_INITIAL_LABELS`` ) and, based on the output compactness
or any other criteria, choose the best clustering.
@@ -199,7 +199,7 @@ SeqPartition
:param labels: Ouput parameter. Double pointer to the sequence of 0-based labels of input sequence elements
:param is_equal: The relation function that should return non-zero if the two particular sequence elements are from the same class, and zero otherwise. The partitioning algorithm uses transitive closure of the relation function as an equivalency critria
:param is_equal: The relation function that should return non-zero if the two particular sequence elements are from the same class, and zero otherwise. The partitioning algorithm uses transitive closure of the relation function as an equivalency criteria
:param userdata: Pointer that is transparently passed to the ``is_equal`` function

48
doc/opencv1/c/core_dynamic_structures.rst
View File

@@ -2751,30 +2751,17 @@ content there if the pointer is not NULL. The function returns a pointer to the
SeqInsertSlice
--------------
.. cfunction:: void cvSeqInsertSlice( CvSeq* seq, int beforeIndex, const CvArr* fromArr )
Inserts an array in the middle of a sequence.
:param seq: Sequence
:param slice: The part of the sequence to remove
:param beforeIndex: Index before which the array is inserted
:param fromArr: The array to take elements from
The function inserts all
``fromArr``
array elements at the specified position of the sequence. The array
@@ -2789,26 +2776,13 @@ can be a matrix or another sequence.
SeqInvert
---------
.. cfunction:: void cvSeqInvert( CvSeq* seq )
Reverses the order of sequence elements.
:param seq: Sequence
The function reverses the sequence in-place - makes the first element go last, the last element go first and so forth.
The function reverses the sequence in-place - the first element becomes the last one, the last element becomes the first one and so forth.
.. index:: SeqPop
@@ -2817,27 +2791,14 @@ The function reverses the sequence in-place - makes the first element go last, t
SeqPop
------
.. cfunction:: void cvSeqPop( CvSeq* seq, void* element=NULL )
Removes an element from the end of a sequence.
:param seq: Sequence
:param element: Optional parameter . If the pointer is not zero, the function copies the removed element to this location.
The function removes an element from a sequence. The function reports an error if the sequence is already empty. The function has O(1) complexity.
@@ -2848,11 +2809,6 @@ The function removes an element from a sequence. The function reports an error i
SeqPopFront
-----------
.. cfunction:: void cvSeqPopFront( CvSeq* seq, void* element=NULL )
Removes an element from the beginning of a sequence.

2
doc/opencv1/c/highgui_user_interface.rst
View File

@@ -339,7 +339,7 @@ may be used to customize a look of HighGUI windows and controls.
qt-specific details:
The function
``cvInitSystem``
is automatically called at the first cvNameWindow call.
is automatically called at the first cvNamedWindow call.
.. index:: MoveWindow