#1205 fixed more bugs/typos in parameters

This commit is contained in:
Andrey Kamaev
2012-03-29 08:07:57 +00:00
parent 008a1c91fd
commit ec793df30f
13 changed files with 283 additions and 289 deletions

View File

@@ -211,7 +211,7 @@ gpu::FAST_GPU::calcKeyPointsLocation
-------------------------------------
Find keypoints and compute it's response if ``nonmaxSupression`` is true.
.. int gpu::FAST_GPU::calcKeyPointsLocation(const GpuMat& image, const GpuMat& mask)
.. ocv:function:: int gpu::FAST_GPU::calcKeyPointsLocation(const GpuMat& image, const GpuMat& mask)
:param image: Image where keypoints (corners) are detected. Only 8-bit grayscale images are supported.

View File

@@ -769,7 +769,7 @@ Performs linear blending of two images.
:param img1: First image. Supports only ``CV_8U`` and ``CV_32F`` depth.
:param img1: Second image. Must have the same size and the same type as ``img1`` .
:param img2: Second image. Must have the same size and the same type as ``img1`` .
:param weights1: Weights for first image. Must have tha same size as ``img1`` . Supports only ``CV_32F`` type.
@@ -789,7 +789,7 @@ Composites two images using alpha opacity values contained in each image.
:param img1: First image. Supports ``CV_8UC4`` , ``CV_16UC4`` , ``CV_32SC4`` and ``CV_32FC4`` types.
:param img1: Second image. Must have the same size and the same type as ``img1`` .
:param img2: Second image. Must have the same size and the same type as ``img1`` .
:param dst: Destination image.

View File

@@ -78,13 +78,11 @@ Computes a matrix-matrix or matrix-scalar per-element product.
gpu::divide
---------------
-----------
Computes a matrix-matrix or matrix-scalar division.
.. ocv:function:: void gpu::divide(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, double scale = 1, int dtype = -1, Stream& stream = Stream::Null())
.. ocv:function:: void gpu::divide(const GpuMat& src1, const Scalar& src2, GpuMat& dst, double scale = 1, int dtype = -1, Stream& stream = Stream::Null())
.. ocv:function:: void gpu::divide(double src1, const GpuMat& src2, GpuMat& dst, int dtype = -1, Stream& stream = Stream::Null())
:param src1: First source matrix or a scalar.
@@ -104,9 +102,8 @@ This function, in contrast to :ocv:func:`divide`, uses a round-down rounding mod
.. seealso:: :ocv:func:`divide`
addWeighted
---------------
gpu::addWeighted
----------------
Computes the weighted sum of two arrays.
.. ocv:function:: void gpu::addWeighted(const GpuMat& src1, double alpha, const GpuMat& src2, double beta, double gamma, GpuMat& dst, int dtype = -1, Stream& stream = Stream::Null())

View File

@@ -47,6 +47,7 @@ Class computing the optical flow for two images using Brox et al Optical Flow al
gpu::GoodFeaturesToTrackDetector_GPU
------------------------------------
.. ocv:class:: gpu::GoodFeaturesToTrackDetector_GPU
Class used for strong corners detection on an image. ::
@@ -120,6 +121,8 @@ Releases inner buffers memory.
gpu::FarnebackOpticalFlow
-------------------------
.. ocv:class:: gpu::FarnebackOpticalFlow
Class computing a dense optical flow using the Gunnar Farnebacks algorithm. ::
class CV_EXPORTS FarnebackOpticalFlow
@@ -179,6 +182,7 @@ Releases unused auxiliary memory buffers.
gpu::PyrLKOpticalFlow
---------------------
.. ocv:class:: gpu::PyrLKOpticalFlow
Class used for calculating an optical flow. ::