From a5d53e3e2fb19c65e0e635ece7ec796c431e2d25 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Fri, 1 Jul 2011 12:09:39 +0000 Subject: [PATCH] some more corrections from Gabor --- modules/core/doc/old_basic_structures.rst | 2 +- .../motion_analysis_and_object_tracking.rst | 7 ++++--- ...ructural_analysis_and_shape_descriptors.rst | 2 +- modules/ml/doc/mldata.rst | 18 +++++++++--------- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/modules/core/doc/old_basic_structures.rst b/modules/core/doc/old_basic_structures.rst index dbc5068bc6..9a75679c9e 100644 --- a/modules/core/doc/old_basic_structures.rst +++ b/modules/core/doc/old_basic_structures.rst @@ -24,7 +24,7 @@ CvPoint constructs ``CvPoint`` structure. -.. ocv:cfunction:: CvPoint cvPointFrom32f( CvPoint32f pt ); +.. ocv:cfunction:: CvPoint cvPointFrom32f( CvPoint32f pt ) converts ``CvPoint2D32f`` to ``CvPoint``. diff --git a/modules/imgproc/doc/motion_analysis_and_object_tracking.rst b/modules/imgproc/doc/motion_analysis_and_object_tracking.rst index 61077c0afd..4c84e1cc2e 100644 --- a/modules/imgproc/doc/motion_analysis_and_object_tracking.rst +++ b/modules/imgproc/doc/motion_analysis_and_object_tracking.rst @@ -31,9 +31,10 @@ The function supports multi-channel images. Each channel is processed independen The functions ``accumulate*`` can be used, for example, to collect statistics of a scene background viewed by a still camera and for the further foreground-background segmentation. .. seealso:: -:ocv:func:`accumulateSquare`, -:ocv:func:`accumulateProduct`, -:ocv:func:`accumulateWeighted` + + :ocv:func:`accumulateSquare`, + :ocv:func:`accumulateProduct`, + :ocv:func:`accumulateWeighted` diff --git a/modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst b/modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst index 24ce626591..1ca559350f 100644 --- a/modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst +++ b/modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst @@ -674,7 +674,7 @@ See below a sample output of the function where each image pixel is tested again .. image:: pics/pointpolygon.png -.. [Fitzgibbon95] Andrew W. Fitzgibbon, R.B.Fisher. *A Buyer’s Guide to Conic Fitting*. Proc.5th British Machine Vision Conference, Birmingham, pp. 513-522, 1995. +.. [Fitzgibbon95] Andrew W. Fitzgibbon, R.B.Fisher. *A Buyer's Guide to Conic Fitting*. Proc.5th British Machine Vision Conference, Birmingham, pp. 513-522, 1995. .. [Hu62] M. Hu. *Visual Pattern Recognition by Moment Invariants*, IRE Transactions on Information Theory, 8:2, pp. 179-187, 1962. diff --git a/modules/ml/doc/mldata.rst b/modules/ml/doc/mldata.rst index 84db016aea..8c5d470fdd 100644 --- a/modules/ml/doc/mldata.rst +++ b/modules/ml/doc/mldata.rst @@ -70,7 +70,7 @@ CvMLData::get_values -------------------- Returns a pointer to the matrix of predictors and response values -.. ocv:function:: const CvMat* CvMLData::get_values() const; +.. ocv:function:: const CvMat* CvMLData::get_values() const The method returns a pointer to the matrix of predictor and response ``values`` or ``0`` if the data has not been loaded from the file yet. @@ -90,7 +90,7 @@ CvMLData::get_missing --------------------- Returns a pointer to the mask matrix of missing values -.. ocv:function:: const CvMat* CvMLData::get_missing() const; +.. ocv:function:: const CvMat* CvMLData::get_missing() const The method returns a pointer to the mask matrix of missing values or throws an exception if the data has not been loaded from the file yet. @@ -110,7 +110,7 @@ CvMLData::get_response_idx -------------------------- Returns index of the response column in the loaded data matrix -.. ocv:function:: int CvMLData::get_response_idx() const; +.. ocv:function:: int CvMLData::get_response_idx() const The method returns the index of a response column in the ``values`` matrix (see :ocv:func:`CvMLData::get_values`) or throws an exception if the data has not been loaded from the file yet. @@ -129,7 +129,7 @@ CvMLData::get_train_sample_idx ------------------------------ Returns the matrix of sample indices for a training subset -.. ocv:function:: const CvMat* CvMLData::get_train_sample_idx() const; +.. ocv:function:: const CvMat* CvMLData::get_train_sample_idx() const The method returns the matrix of sample indices for a training subset. This is a single-row matrix of the type ``CV_32SC1``. If data split is not set, the method returns ``0``. If the data has not been loaded from the file yet, an exception is thrown. @@ -137,7 +137,7 @@ CvMLData::get_test_sample_idx ----------------------------- Returns the matrix of sample indices for a testing subset -.. ocv:function:: const CvMat* CvMLData::get_test_sample_idx() const; +.. ocv:function:: const CvMat* CvMLData::get_test_sample_idx() const CvMLData::mix_train_and_test_idx @@ -186,7 +186,7 @@ CvMLData::get_var_type ---------------------- Returns type of the specified variable -.. ocv:function:: int CvMLData::get_var_type( int var_idx ) const; +.. ocv:function:: int CvMLData::get_var_type( int var_idx ) const The method returns the type of a variable by the index ``var_idx`` ( ``CV_VAR_ORDERED`` or ``CV_VAR_CATEGORICAL``). @@ -210,7 +210,7 @@ CvMLData::get_delimiter ----------------------- Returns the currently used delimiter character. -.. ocv:function:: char CvMLData::get_delimiter() const; +.. ocv:function:: char CvMLData::get_delimiter() const CvMLData::set_miss_ch @@ -225,13 +225,13 @@ CvMLData::get_miss_ch --------------------- Returns the currently used missing value character. -.. ocv:function:: char CvMLData::get_miss_ch() const; +.. ocv:function:: char CvMLData::get_miss_ch() const CvMLData::get_class_labels_map ------------------------------- Returns a map that converts strings to labels. -.. ocv:function:: const std::map& CvMLData::get_class_labels_map() const; +.. ocv:function:: const std::map& CvMLData::get_class_labels_map() const The method returns a map that converts string class labels to the numerical class labels. It can be used to get an original class label as in a file.