Skip to content

O
opencv
Commit 7b806f60 authored by Andrey Kamaev's avatar Andrey Kamaev
Browse files
Options

fixed several documentation errors

parent d85ef03a
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 82 deletions
modules/contrib/doc/facerec.rst
View file @ 7b806f60
...@@ -4,16 +4,18 @@ Face Recognition with OpenCV ...@@ -4,16 +4,18 @@ Face Recognition with OpenCV
.. highlight:: cpp .. highlight:: cpp
This document is going to explain how to perform face recognition with the new This document is going to explain how to perform face recognition with the new
:ocv:class:`FaceRecognizer`, which is available from OpenCV 2.4 onwards. :ocv:class:`FaceRecognizer`, which is available from OpenCV 2.4 onwards.
FaceRecognizer FaceRecognizer
-------------- --------------
All face recognition models in OpenCV are derived from the abstract base All face recognition models in OpenCV are derived from the abstract base
class :ocv:class:`FaceRecognizer`, which provides a unified access to all face class :ocv:class:`FaceRecognizer`, which provides a unified access to all face
recongition algorithms in OpenCV. recongition algorithms in OpenCV.
.. ocv:class:: FaceRecognizer .. ocv:class:: FaceRecognizer : public Algorithm
.. code-block:: cpp
class FaceRecognizer : public Algorithm class FaceRecognizer : public Algorithm
{ {
...@@ -43,7 +45,7 @@ recongition algorithms in OpenCV. ...@@ -43,7 +45,7 @@ recongition algorithms in OpenCV.
virtual void load(const FileStorage& fs) = 0; virtual void load(const FileStorage& fs) = 0;
}; };
Ptr<FaceRecognizer> createEigenFaceRecognizer(int num_components = 0, double threshold = DBL_MAX); Ptr<FaceRecognizer> createEigenFaceRecognizer(int num_components = 0, double threshold = DBL_MAX);
Ptr<FaceRecognizer> createFisherFaceRecognizer(int num_components = 0, double threshold = DBL_MAX); Ptr<FaceRecognizer> createFisherFaceRecognizer(int num_components = 0, double threshold = DBL_MAX);
Ptr<FaceRecognizer> createLBPHFaceRecognizer(int radius=1, int neighbors=8, int grid_x=8, int grid_y=8, double threshold = DBL_MAX); Ptr<FaceRecognizer> createLBPHFaceRecognizer(int radius=1, int neighbors=8, int grid_x=8, int grid_y=8, double threshold = DBL_MAX);
...@@ -55,10 +57,10 @@ Trains a FaceRecognizer with given data and associated labels. ...@@ -55,10 +57,10 @@ Trains a FaceRecognizer with given data and associated labels.
.. ocv:function:: void FaceRecognizer::train(InputArray src, InputArray labels) .. ocv:function:: void FaceRecognizer::train(InputArray src, InputArray labels)
Every model subclassing :ocv:class:`FaceRecognizer` is able to work with Every model subclassing :ocv:class:`FaceRecognizer` is able to work with
image data in ``src``, which must be given as a ``vector<Mat>``. A ``vector<Mat>`` image data in ``src``, which must be given as a ``vector<Mat>``. A ``vector<Mat>``
was chosen, so that no preliminary assumptions about the input samples is made. was chosen, so that no preliminary assumptions about the input samples is made.
The Local Binary Patterns for example process 2D images of different size, while The Local Binary Patterns for example process 2D images of different size, while
Eigenfaces and Fisherfaces method reshape all images in ``src`` to a data matrix. Eigenfaces and Fisherfaces method reshape all images in ``src`` to a data matrix.
The associated labels in ``labels`` have to be given either in a ``Mat`` The associated labels in ``labels`` have to be given either in a ``Mat``
...@@ -87,16 +89,16 @@ The following example shows how to learn a Eigenfaces model with OpenCV: ...@@ -87,16 +89,16 @@ The following example shows how to learn a Eigenfaces model with OpenCV:
FaceRecognizer::predict FaceRecognizer::predict
----------------------- -----------------------
Predicts the label for a given query image in ``src``. Predicts the label for a given query image in ``src``.
.. ocv:function:: int FaceRecognizer::predict(InputArray src) const .. ocv:function:: int FaceRecognizer::predict(InputArray src) const
Predicts the label for a given query image in ``src``. Predicts the label for a given query image in ``src``.
.. ocv:function:: void FaceRecognizer::predict(InputArray src, int &label, double &dist) const .. ocv:function:: void FaceRecognizer::predict(InputArray src, int &label, double &dist) const
The suffix ``const`` means that prediction does not affect the internal model The suffix ``const`` means that prediction does not affect the internal model
state, so the method can be safely called from within different threads. state, so the method can be safely called from within different threads.
The following example shows how to get a prediction from a trained model: The following example shows how to get a prediction from a trained model:
...@@ -104,7 +106,7 @@ The following example shows how to get a prediction from a trained model: ...@@ -104,7 +106,7 @@ The following example shows how to get a prediction from a trained model:
.. code-block:: cpp .. code-block:: cpp
int predictedLabel = model->predict(testSample); int predictedLabel = model->predict(testSample);
To get the confidence of a prediction call the model with: To get the confidence of a prediction call the model with:
.. code-block:: cpp .. code-block:: cpp
...@@ -122,11 +124,11 @@ Saves a :ocv:class:`FaceRecognizer` and its model state. ...@@ -122,11 +124,11 @@ Saves a :ocv:class:`FaceRecognizer` and its model state.
.. ocv:function:: void FaceRecognizer::save(FileStorage& fs) const .. ocv:function:: void FaceRecognizer::save(FileStorage& fs) const
Every :ocv:class:`FaceRecognizer` overwrites ``FaceRecognizer::save(FileStorage& fs)`` Every :ocv:class:`FaceRecognizer` overwrites ``FaceRecognizer::save(FileStorage& fs)``
to save its internal model state. You can then either call ``FaceRecognizer::save(FileStorage& fs)`` to save its internal model state. You can then either call ``FaceRecognizer::save(FileStorage& fs)``
to save the model or use ``FaceRecognizer::save(const string& filename)``, which eases saving a to save the model or use ``FaceRecognizer::save(const string& filename)``, which eases saving a
model. model.
The suffix ``const`` means that prediction does not affect the internal model The suffix ``const`` means that prediction does not affect the internal model
state, so the method can be safely called from within different threads. state, so the method can be safely called from within different threads.
FaceRecognizer::load FaceRecognizer::load
...@@ -135,12 +137,12 @@ FaceRecognizer::load ...@@ -135,12 +137,12 @@ FaceRecognizer::load
Loads a :ocv:class:`FaceRecognizer` and its model state. Loads a :ocv:class:`FaceRecognizer` and its model state.
.. ocv:function:: void FaceRecognizer::load(const string& filename) .. ocv:function:: void FaceRecognizer::load(const string& filename)
.. ocv:function:: void FaceRecognizer::load(FileStorage& fs) .. ocv:function:: void FaceRecognizer::load(const FileStorage& fs)
Loads a persisted model and state from a given XML or YAML file . Every Loads a persisted model and state from a given XML or YAML file . Every
:ocv:class:`FaceRecognizer` has overwrites ``FaceRecognizer::load(FileStorage& fs)`` :ocv:class:`FaceRecognizer` has overwrites ``FaceRecognizer::load(FileStorage& fs)``
to enable loading the internal model state. ``FaceRecognizer::load(const string& filename)`` to enable loading the internal model state. ``FaceRecognizer::load(const string& filename)``
eases saving a model, so you just need to call it on the filename. eases saving a model, so you just need to call it on the filename.
createEigenFaceRecognizer createEigenFaceRecognizer
------------------------- -------------------------
...@@ -151,28 +153,28 @@ Creates an Eigenfaces model with given number of components (if given) and thres ...@@ -151,28 +153,28 @@ Creates an Eigenfaces model with given number of components (if given) and thres
This model implements the Eigenfaces method as described in [TP91]_. This model implements the Eigenfaces method as described in [TP91]_.
* ``num_components`` (default 0) number of components are kept for classification. If no number of * ``num_components`` (default 0) number of components are kept for classification. If no number of
components is given, it is automatically determined from given data in components is given, it is automatically determined from given data in
:ocv:func:`FaceRecognizer::train`. If (and only if) ``num_components`` <= 0, then :ocv:func:`FaceRecognizer::train`. If (and only if) ``num_components`` <= 0, then
``num_components`` is set to (N-1) in ocv:func:`Eigenfaces::train`, with *N* being the ``num_components`` is set to (N-1) in :ocv:func:`Eigenfaces::train`, with *N* being the
total number of samples in ``src``. total number of samples in ``src``.
* ``threshold`` (default DBL_MAX) * ``threshold`` (default DBL_MAX)
Internal model data, which can be accessed through cv::Algorithm: Internal model data, which can be accessed through cv::Algorithm:
* ``ncomponents`` * ``ncomponents``
* ``threshold`` * ``threshold``
* ``eigenvectors`` * ``eigenvectors``
* ``eigenvalues`` * ``eigenvalues``
* ``mean`` * ``mean``
* ``labels`` * ``labels``
* ``projections`` * ``projections``
createFisherFaceRecognizer createFisherFaceRecognizer
...@@ -184,26 +186,26 @@ Creates a Fisherfaces model for given a given number of components and threshold ...@@ -184,26 +186,26 @@ Creates a Fisherfaces model for given a given number of components and threshold
This model implements the Fisherfaces method as described in [BHK97]_. This model implements the Fisherfaces method as described in [BHK97]_.
* ``num_components`` number of components are kept for classification. If no number * ``num_components`` number of components are kept for classification. If no number
of components is given (default 0), it is automatically determined from given data of components is given (default 0), it is automatically determined from given data
in :ocv:func:`Fisherfaces::train` (model implementation). If (and only if) in :ocv:func:`Fisherfaces::train` (model implementation). If (and only if)
``num_components`` <= 0, then ``num_components`` is set to (C-1) in ``num_components`` <= 0, then ``num_components`` is set to (C-1) in
ocv:func:`train`, with *C* being the number of unique classes in ``labels``. :ocv:func:`train`, with *C* being the number of unique classes in ``labels``.
* ``threshold`` (default DBL_MAX) * ``threshold`` (default DBL_MAX)
Internal model data, which can be accessed through cv::Algorithm: Internal model data, which can be accessed through cv::Algorithm:
* ``ncomponents`` * ``ncomponents``
* ``threshold`` * ``threshold``
* ``projections`` * ``projections``
* ``labels`` * ``labels``
* ``eigenvectors`` * ``eigenvectors``
* ``eigenvalues`` * ``eigenvalues``
* ``mean`` * ``mean``
...@@ -213,41 +215,41 @@ createLBPHFaceRecognizer ...@@ -213,41 +215,41 @@ createLBPHFaceRecognizer
Implements face recognition with Local Binary Patterns Histograms as described in [Ahonen04]_. Implements face recognition with Local Binary Patterns Histograms as described in [Ahonen04]_.
.. ocv:function:: Ptr<FaceRecognizer> createLBPHFaceRecognizer(int radius=1, int neighbors=8, int grid_x=8, int grid_y=8, double threshold = DBL_MAX); .. ocv:function:: Ptr<FaceRecognizer> createLBPHFaceRecognizer(int radius=1, int neighbors=8, int grid_x=8, int grid_y=8, double threshold = DBL_MAX)
Internal model data, which can be accessed through cv::Algorithm: Internal model data, which can be accessed through cv::Algorithm:
* ``radius`` * ``radius``
* ``neighbors`` * ``neighbors``
* ``grid_x`` * ``grid_x``
* ``grid_y`` * ``grid_y``
* ``threshold`` * ``threshold``
* ``histograms`` * ``histograms``
* ``labels`` * ``labels``
Example: Working with a cv::FaceRecognizer Example: Working with a cv::FaceRecognizer
=========================================== ===========================================
In this tutorial you'll see how to do face recognition with OpenCV on real image data. We'll work through a complete example, so you know how to work with it. While this example is based on Eigenfaces, it works the same for all the other available :ocv:class:`FaceRecognizer` implementations. In this tutorial you'll see how to do face recognition with OpenCV on real image data. We'll work through a complete example, so you know how to work with it. While this example is based on Eigenfaces, it works the same for all the other available :ocv:class:`FaceRecognizer` implementations.
Getting Image Data Getting Image Data
------------------ ------------------
We are doing face recognition, so you'll need some face images first! You can decide to either create your own database or start with one of the many available datasets. `face-rec.org/databases <http://face-rec.org/databases/>`_ gives an up-to-date overview of public available datasets (parts of the following descriptions are quoted from there). We are doing face recognition, so you'll need some face images first! You can decide to either create your own database or start with one of the many available datasets. `face-rec.org/databases <http://face-rec.org/databases/>`_ gives an up-to-date overview of public available datasets (parts of the following descriptions are quoted from there).
Three interesting databases are: Three interesting databases are:
* `AT&T Facedatabase <http://www.cl.cam.ac.uk/research/dtg/attarchive/facedatabase.html>`_ The AT&T Facedatabase, sometimes also referred to as *ORL Database of Faces*, contains ten different images of each of 40 distinct subjects. For some subjects, the images were taken at different times, varying the lighting, facial expressions (open / closed eyes, smiling / not smiling) and facial details (glasses / no glasses). All the images were taken against a dark homogeneous background with the subjects in an upright, frontal position (with tolerance for some side movement). * `AT&T Facedatabase <http://www.cl.cam.ac.uk/research/dtg/attarchive/facedatabase.html>`_ The AT&T Facedatabase, sometimes also referred to as *ORL Database of Faces*, contains ten different images of each of 40 distinct subjects. For some subjects, the images were taken at different times, varying the lighting, facial expressions (open / closed eyes, smiling / not smiling) and facial details (glasses / no glasses). All the images were taken against a dark homogeneous background with the subjects in an upright, frontal position (with tolerance for some side movement).
* `Yale Facedatabase A <http://cvc.yale.edu/projects/yalefaces/yalefaces.html>`_ The AT&T Facedatabase is good for initial tests, but it's a fairly easy database. The Eigenfaces method already has a 97% recognition rate, so you won't see any improvements with other algorithms. The Yale Facedatabase A is a more appropriate dataset for initial experiments, because the recognition problem is harder. The database consists of 15 people (14 male, 1 female) each with 11 grayscale images sized :math:`320 \times 243` pixel. There are changes in the light conditions (center light, left light, right light), facial expressions (happy, normal, sad, sleepy, surprised, wink) and glasses (glasses, no-glasses). * `Yale Facedatabase A <http://cvc.yale.edu/projects/yalefaces/yalefaces.html>`_ The AT&T Facedatabase is good for initial tests, but it's a fairly easy database. The Eigenfaces method already has a 97% recognition rate, so you won't see any improvements with other algorithms. The Yale Facedatabase A is a more appropriate dataset for initial experiments, because the recognition problem is harder. The database consists of 15 people (14 male, 1 female) each with 11 grayscale images sized :math:`320 \times 243` pixel. There are changes in the light conditions (center light, left light, right light), facial expressions (happy, normal, sad, sleepy, surprised, wink) and glasses (glasses, no-glasses).
* `Extended Yale Facedatabase B <http://vision.ucsd.edu/~leekc/ExtYaleDatabase/ExtYaleB.html>`_ The Extended Yale Facedatabase B contains 2414 images of 38 different people in its cropped version. The focus of this database is set on extracting features that are robust to illumination, the images have almost no variation in emotion/occlusion/... . I personally think, that this dataset is too large for the experiments I perform in this document. You better use the `AT&T Facedatabase <http://www.cl.cam.ac.uk/research/dtg/attarchive/facedatabase.html>`_ for intial testing. A first version of the Yale Facedatabase B was used in [Belhumeur97]_ to see how the Eigenfaces and Fisherfaces method perform under heavy illumination changes. [Lee2005]_ used the same setup to take 16128 images of 28 people. The Extended Yale Facedatabase B is the merge of the two databases, which is now known as Extended Yalefacedatabase B. * `Extended Yale Facedatabase B <http://vision.ucsd.edu/~leekc/ExtYaleDatabase/ExtYaleB.html>`_ The Extended Yale Facedatabase B contains 2414 images of 38 different people in its cropped version. The focus of this database is set on extracting features that are robust to illumination, the images have almost no variation in emotion/occlusion/... . I personally think, that this dataset is too large for the experiments I perform in this document. You better use the `AT&T Facedatabase <http://www.cl.cam.ac.uk/research/dtg/attarchive/facedatabase.html>`_ for intial testing. A first version of the Yale Facedatabase B was used in [Belhumeur97]_ to see how the Eigenfaces and Fisherfaces method perform under heavy illumination changes. [Lee2005]_ used the same setup to take 16128 images of 28 people. The Extended Yale Facedatabase B is the merge of the two databases, which is now known as Extended Yalefacedatabase B.
For this tutorial I am going to use the `AT&T Facedatabase <http://www.cl.cam.ac.uk/research/dtg/attarchive/facedatabase.html>`_, which is available from: `http://www.cl.cam.ac.uk/research/dtg/attarchive/facedatabase.html <http://www.cl.cam.ac.uk/research/dtg/attarchive/facedatabase.html>`_. All credit for this dataset is given to the *AT&T Laboratories, Cambridge*, also make sure to read the README For this tutorial I am going to use the `AT&T Facedatabase <http://www.cl.cam.ac.uk/research/dtg/attarchive/facedatabase.html>`_, which is available from: `http://www.cl.cam.ac.uk/research/dtg/attarchive/facedatabase.html <http://www.cl.cam.ac.uk/research/dtg/attarchive/facedatabase.html>`_. All credit for this dataset is given to the *AT&T Laboratories, Cambridge*, also make sure to read the README
...@@ -255,7 +257,7 @@ For this tutorial I am going to use the `AT&T Facedatabase <http://www.cl.cam.ac ...@@ -255,7 +257,7 @@ For this tutorial I am going to use the `AT&T Facedatabase <http://www.cl.cam.ac
Reading the Image Data Reading the Image Data
----------------------- -----------------------
In the demo I have decided to read the images from a very simple CSV file. Why? Because it's the simplest platform-independent approach I can think of. However, if you know a simpler solution please ping me about it. Basically all the CSV file needs to contain are lines composed of a **filename** followed by a **;** followed by the **label** (as integer number), making up a line like this: In the demo I have decided to read the images from a very simple CSV file. Why? Because it's the simplest platform-independent approach I can think of. However, if you know a simpler solution please ping me about it. Basically all the CSV file needs to contain are lines composed of a **filename** followed by a **;** followed by the **label** (as integer number), making up a line like this:
.. code-block:: none .. code-block:: none
...@@ -466,15 +468,15 @@ Results ...@@ -466,15 +468,15 @@ Results
Saving and Loading a cv::FaceRecognizer Saving and Loading a cv::FaceRecognizer
======================================= =======================================
Saving and loading a :ocv:class:`FaceRecognizer` is a very important task, because Saving and loading a :ocv:class:`FaceRecognizer` is a very important task, because
training a :ocv:class:`FaceRecognizer` can be a very time-intense task for large training a :ocv:class:`FaceRecognizer` can be a very time-intense task for large
datasets (depending on your algorithm). In OpenCV you only have to call datasets (depending on your algorithm). In OpenCV you only have to call
:ocv:func:`FaceRecognizer::load` for loading, and :ocv:func:`FaceRecognizer::save` :ocv:func:`FaceRecognizer::load` for loading, and :ocv:func:`FaceRecognizer::save`
for saving the internal state of a :ocv:class:`FaceRecognizer`. for saving the internal state of a :ocv:class:`FaceRecognizer`.
Imagine we are using the same example as above. We want to learn the Eigenfaces of Imagine we are using the same example as above. We want to learn the Eigenfaces of
the `AT&T Facedatabase <http://www.cl.cam.ac.uk/research/dtg/attarchive/facedatabase.html>`_, the `AT&T Facedatabase <http://www.cl.cam.ac.uk/research/dtg/attarchive/facedatabase.html>`_,
but store the model to a YAML file so we can load it from somewhere else. but store the model to a YAML file so we can load it from somewhere else.
To see if everything went fine, we'll have a look at the stored data and the first 10 Eigenfaces. To see if everything went fine, we'll have a look at the stored data and the first 10 Eigenfaces.
...@@ -484,12 +486,12 @@ Demo application ...@@ -484,12 +486,12 @@ Demo application
.. code-block:: none .. code-block:: none
TODO TODO
Results Results
------- -------
``eigenfaces_at.yml`` contains the model state, we'll simply show the first 10 ``eigenfaces_at.yml`` contains the model state, we'll simply show the first 10
lines with ``head eigenfaces_at.yml``: lines with ``head eigenfaces_at.yml``:
.. code-block:: none .. code-block:: none
......
modules/core/doc/dynamic_structures.rst
View file @ 7b806f60
...@@ -588,11 +588,11 @@ GetSetElem ...@@ -588,11 +588,11 @@ GetSetElem
---------- ----------
Finds a set element by its index. Finds a set element by its index.
.. ocv:cfunction:: CvSetElem* cvGetSetElem( const CvSet* set_header, int index ) .. ocv:cfunction:: CvSetElem* cvGetSetElem( const CvSet* set_header, int idx )
:param set_header: Set :param set_header: Set
:param index: Index of the set element within a sequence :param idx: Index of the set element within a sequence
The function finds a set element by its index. The function returns the pointer to it or 0 if the index is invalid or the corresponding node is free. The function supports negative indices as it uses The function finds a set element by its index. The function returns the pointer to it or 0 if the index is invalid or the corresponding node is free. The function supports negative indices as it uses
:ocv:cfunc:`GetSeqElem` :ocv:cfunc:`GetSeqElem`
......
modules/core/doc/xml_yaml_persistence.rst
View file @ 7b806f60
...@@ -167,7 +167,7 @@ The constructors. ...@@ -167,7 +167,7 @@ The constructors.
* **FileStorage::WRITE** Open the file for writing. * **FileStorage::WRITE** Open the file for writing.
* **FileStorage::APPEND** Open the file for appending. * **FileStorage::APPEND** Open the file for appending.
* **FileStorage::MEMORY** Read data from ``source`` or write data to the internal buffer (which is returned by ``FileStorage::release``) * **FileStorage::MEMORY** Read data from ``source`` or write data to the internal buffer (which is returned by ``FileStorage::release``)
:param encoding: Encoding of the file. Note that UTF-16 XML encoding is not supported currently and you should use 8-bit encoding instead of it. :param encoding: Encoding of the file. Note that UTF-16 XML encoding is not supported currently and you should use 8-bit encoding instead of it.
...@@ -199,7 +199,7 @@ FileStorage::release ...@@ -199,7 +199,7 @@ FileStorage::release
-------------------- --------------------
Closes the file and releases all the memory buffers. Closes the file and releases all the memory buffers.
.. ocv:function:: string FileStorage::release() .. ocv:function:: void FileStorage::release()
Call this method after all I/O operations with the storage are finished. If the storage was opened for writing data and ``FileStorage::WRITE`` was specified Call this method after all I/O operations with the storage are finished. If the storage was opened for writing data and ``FileStorage::WRITE`` was specified
......
modules/features2d/doc/feature_detection_and_description.rst
View file @ 7b806f60
...@@ -94,9 +94,9 @@ Finds keypoints in an image and computes their descriptors ...@@ -94,9 +94,9 @@ Finds keypoints in an image and computes their descriptors
:param useProvidedKeypoints: If it is true, then the method will use the provided vector of keypoints instead of detecting them. :param useProvidedKeypoints: If it is true, then the method will use the provided vector of keypoints instead of detecting them.
FREAK FREAK
----- -----
.. ocv:class:: FREAK .. ocv:class:: FREAK : public DescriptorExtractor
Class implementing the FREAK (*Fast Retina Keypoint*) keypoint descriptor, described in [AOV12]_. The algorithm propose a novel keypoint descriptor inspired by the human visual system and more precisely the retina, coined Fast Retina Key- point (FREAK). A cascade of binary strings is computed by efficiently comparing image intensities over a retinal sampling pattern. FREAKs are in general faster to compute with lower memory load and also more robust than SIFT, SURF or BRISK. They are competitive alternatives to existing keypoints in particular for embedded applications. Class implementing the FREAK (*Fast Retina Keypoint*) keypoint descriptor, described in [AOV12]_. The algorithm propose a novel keypoint descriptor inspired by the human visual system and more precisely the retina, coined Fast Retina Key- point (FREAK). A cascade of binary strings is computed by efficiently comparing image intensities over a retinal sampling pattern. FREAKs are in general faster to compute with lower memory load and also more robust than SIFT, SURF or BRISK. They are competitive alternatives to existing keypoints in particular for embedded applications.
...@@ -106,12 +106,12 @@ FREAK::FREAK ...@@ -106,12 +106,12 @@ FREAK::FREAK
------------ ------------
The FREAK constructor The FREAK constructor
.. ocv:function:: FREAK::FREAK(bool orientationNormalized = true, bool scaleNormalized = true, float patternScale = 22.0f, int nbOctave = 4, const vector<int>& selectedPairs = vector<int>()) .. ocv:function:: FREAK::FREAK( bool orientationNormalized=true, bool scaleNormalized=true, float patternScale=22.0f, int nOctaves=4, const vector<int>& selectedPairs=vector<int>() )
:param orientationNormalized: Enable orientation normalization. :param orientationNormalized: Enable orientation normalization.
:param scaleNormalized: Enable scale normalization. :param scaleNormalized: Enable scale normalization.
:param patternScale: Scaling of the description pattern. :param patternScale: Scaling of the description pattern.
:param nbOctave: Number of octaves covered by the detected keypoints. :param nOctaves: Number of octaves covered by the detected keypoints.
:param selectedPairs: (Optional) user defined selected pairs indexes, :param selectedPairs: (Optional) user defined selected pairs indexes,
FREAK::selectPairs FREAK::selectPairs
...@@ -126,4 +126,3 @@ We notice that for keypoint matching applications, image content has little effe ...@@ -126,4 +126,3 @@ We notice that for keypoint matching applications, image content has little effe
:param keypoints: Set of detected keypoints :param keypoints: Set of detected keypoints
:param corrThresh: Correlation threshold. :param corrThresh: Correlation threshold.
:param verbose: Prints pair selection informations. :param verbose: Prints pair selection informations.
\ No newline at end of file
modules/gpu/doc/video.rst
View file @ 7b806f60
...@@ -324,9 +324,9 @@ Class used for background/foreground segmentation. :: ...@@ -324,9 +324,9 @@ Class used for background/foreground segmentation. ::
std::vector< std::vector<cv::Point> > foreground_regions; std::vector< std::vector<cv::Point> > foreground_regions;
}; };
The class discriminates between foreground and background pixels by building and maintaining a model of the background. Any pixel which does not fit this model is then deemed to be foreground. The class implements algorithm described in [FGD2003]_. The class discriminates between foreground and background pixels by building and maintaining a model of the background. Any pixel which does not fit this model is then deemed to be foreground. The class implements algorithm described in [FGD2003]_.
The results are available through the class fields: The results are available through the class fields:
.. ocv:member:: cv::gpu::GpuMat background .. ocv:member:: cv::gpu::GpuMat background
...@@ -383,7 +383,7 @@ gpu::FGDStatModel::update ...@@ -383,7 +383,7 @@ gpu::FGDStatModel::update
-------------------------- --------------------------
Updates the background model and returns foreground regions count. Updates the background model and returns foreground regions count.
.. ocv:function:: int gpu::FGDStatModel::update(const cv::gpu::GpuMat& curFrame); .. ocv:function:: int gpu::FGDStatModel::update(const cv::gpu::GpuMat& curFrame)
:param curFrame: Next video frame. :param curFrame: Next video frame.
...@@ -615,7 +615,7 @@ Class for reading video from files. ...@@ -615,7 +615,7 @@ Class for reading video from files.
gpu::VideoReader_GPU::Codec gpu::VideoReader_GPU::Codec
--------------------------- ---------------------------
Video codecs supported by ocv:class:`gpu::VideoReader_GPU` . :: Video codecs supported by :ocv:class:`gpu::VideoReader_GPU` . ::
enum Codec enum Codec
{ {
...@@ -640,7 +640,7 @@ Video codecs supported by ocv:class:`gpu::VideoReader_GPU` . :: ...@@ -640,7 +640,7 @@ Video codecs supported by ocv:class:`gpu::VideoReader_GPU` . ::
gpu::VideoReader_GPU::ChromaFormat gpu::VideoReader_GPU::ChromaFormat
---------------------------------- ----------------------------------
Chroma formats supported by ocv:class:`gpu::VideoReader_GPU` . :: Chroma formats supported by :ocv:class:`gpu::VideoReader_GPU` . ::
enum ChromaFormat enum ChromaFormat
{ {
...@@ -783,7 +783,7 @@ Starts processing. ...@@ -783,7 +783,7 @@ Starts processing.
.. ocv:function:: virtual void gpu::VideoReader_GPU::VideoSource::start() = 0 .. ocv:function:: virtual void gpu::VideoReader_GPU::VideoSource::start() = 0
Implementation must create own thread with video processing and call periodic ocv:func:`gpu::VideoReader_GPU::VideoSource::parseVideoData` . Implementation must create own thread with video processing and call periodic :ocv:func:`gpu::VideoReader_GPU::VideoSource::parseVideoData` .
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment