diff --git a/modules/core/doc/old_basic_structures.rst b/modules/core/doc/old_basic_structures.rst index ef742ce7e0..4e0c189752 100644 --- a/modules/core/doc/old_basic_structures.rst +++ b/modules/core/doc/old_basic_structures.rst @@ -1655,7 +1655,7 @@ Initializes a random number generator state. The function initializes a random number generator and returns the state. The pointer to the state can be then passed to the :ocv:cfunc:`RandInt`, :ocv:cfunc:`RandReal` and :ocv:cfunc:`RandArr` functions. In the current implementation a multiply-with-carry generator is used. -.. sealso:: the C++ class :ocv:class:`RNG` replaced ``CvRNG``. +.. seealso:: the C++ class :ocv:class:`RNG` replaced ``CvRNG``. RandArr diff --git a/modules/imgproc/doc/miscellaneous_transformations.rst b/modules/imgproc/doc/miscellaneous_transformations.rst index 7bfb148a94..b9507000f4 100644 --- a/modules/imgproc/doc/miscellaneous_transformations.rst +++ b/modules/imgproc/doc/miscellaneous_transformations.rst @@ -497,10 +497,9 @@ Fills a connected component with the given color. :param image: Input/output 1- or 3-channel, 8-bit, or floating-point image. It is modified by the function unless the ``FLOODFILL_MASK_ONLY`` flag is set in the second variant of the function. See the details below. :param mask: (For the second function only) Operation mask that should be a single-channel 8-bit image, 2 pixels wider and 2 pixels taller. The function uses and updates the mask, so you take responsibility of initializing the ``mask`` content. Flood-filling cannot go across non-zero pixels in the mask. For example, an edge detector output can be used as a mask to stop filling at edges. It is possible to use the same mask in multiple calls to the function to make sure the filled area does not overlap. - - .. note:: - Since the mask is larger than the filled image, a pixel :math:`(x, y)` in ``image`` corresponds to the pixel :math:`(x+1, y+1)` in the ``mask`` . - + + .. note:: Since the mask is larger than the filled image, a pixel :math:`(x, y)` in ``image`` corresponds to the pixel :math:`(x+1, y+1)` in the ``mask`` . + :param seed: Starting point. :param newVal: New value of the repainted domain pixels. @@ -782,11 +781,7 @@ should be set to 0's. In the function output, each pixel in markers is set to a value of the "seed" components or to -1 at boundaries between the regions. -.. note:: Every two neighbor connected -components are not necessarily separated by a watershed boundary (-1's pixels); for -example, when such tangent components exist in the initial -marker image. Visual demonstration and usage example of the function -can be found in the OpenCV samples directory (see the ``watershed.cpp`` demo). +.. note:: Every two neighbor connected components are not necessarily separated by a watershed boundary (-1's pixels); for example, when such tangent components exist in the initial marker image. Visual demonstration and usage example of the function can be found in the OpenCV samples directory (see the ``watershed.cpp`` demo). .. seealso:: :ocv:func:`findContours` diff --git a/modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst b/modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst index 9a7c0ee6af..718c95b6da 100644 --- a/modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst +++ b/modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst @@ -68,14 +68,12 @@ The normalized central moments \texttt{nu} _{ji}= \frac{\texttt{mu}_{ji}}{\texttt{m}_{00}^{(i+j)/2+1}} . .. note:: -:math:`\texttt{mu}_{00}=\texttt{m}_{00}`, -:math:`\texttt{nu}_{00}=1` -:math:`\texttt{nu}_{10}=\texttt{mu}_{10}=\texttt{mu}_{01}=\texttt{mu}_{10}=0` , hence the values are not stored. -The moments of a contour are defined in the same way but computed using the Green's formula -(see -http://en.wikipedia.org/wiki/Green_theorem -). So, due to a limited raster resolution, the moments computed for a contour are slightly different from the moments computed for the same rasterized contour. + :math:`\texttt{mu}_{00}=\texttt{m}_{00}`, + :math:`\texttt{nu}_{00}=1` + :math:`\texttt{nu}_{10}=\texttt{mu}_{10}=\texttt{mu}_{01}=\texttt{mu}_{10}=0` , hence the values are not stored. + +The moments of a contour are defined in the same way but computed using the Green's formula (see http://en.wikipedia.org/wiki/Green_theorem). So, due to a limited raster resolution, the moments computed for a contour are slightly different from the moments computed for the same rasterized contour. .. seealso:: @@ -155,9 +153,7 @@ Finds contours in a binary image. The function retrieves contours from the binary image using the algorithm [Suzuki85]_. The contours are a useful tool for shape analysis and object detection and recognition. See ``squares.c`` in the OpenCV sample directory. -.. note:: -Source ``image`` is modified by this function. - +.. note:: Source ``image`` is modified by this function. drawContours