merged all the latest changes from 2.4 to trunk

modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst

@@ -279,7 +279,7 @@ Class computing stereo correspondence using the constant space belief propagatio
     };
 
 
-The class implements algorithm described in [Yang2010]_. ``StereoConstantSpaceBP`` supports both local minimum and global minimum data cost initialization algortihms. For more details, see the paper mentioned above. By default, a local algorithm is used. To enable a global algorithm, set ``use_local_init_data_cost`` to ``false`` .
+The class implements algorithm described in [Yang2010]_. ``StereoConstantSpaceBP`` supports both local minimum and global minimum data cost initialization algorithms. For more details, see the paper mentioned above. By default, a local algorithm is used. To enable a global algorithm, set ``use_local_init_data_cost`` to ``false`` .
 
 
 
@@ -323,7 +323,7 @@ Enables the :ocv:class:`gpu::StereoConstantSpaceBP` constructors.
 
 For more details, see [Yang2010]_.
 
-By default, ``StereoConstantSpaceBP`` uses floating-point arithmetics and the ``CV_32FC1`` type for messages. But it can also use fixed-point arithmetics and the ``CV_16SC1`` message type for better perfomance. To avoid an overflow in this case, the parameters must satisfy the following requirement:
+By default, ``StereoConstantSpaceBP`` uses floating-point arithmetics and the ``CV_32FC1`` type for messages. But it can also use fixed-point arithmetics and the ``CV_16SC1`` message type for better performance. To avoid an overflow in this case, the parameters must satisfy the following requirement:
 
 .. math::
 
@@ -359,7 +359,7 @@ gpu::DisparityBilateralFilter
 -----------------------------
 .. ocv:class:: gpu::DisparityBilateralFilter
 
-Class refinining a disparity map using joint bilateral filtering. ::
+Class refining a disparity map using joint bilateral filtering. ::
 
     class CV_EXPORTS DisparityBilateralFilter
     {

modules/gpu/doc/data_structures.rst

@@ -172,7 +172,7 @@ Ensures that the size of a matrix is big enough and the matrix has a proper type
 
     :param cols: Minimum desired number of columns.
 
-    :param size: Rows and coumns passed as a structure.
+    :param size: Rows and columns passed as a structure.
 
     :param type: Desired matrix type.
 

modules/gpu/doc/feature_detection_and_description.rst

@@ -168,7 +168,7 @@ Constructor.
 
     :param threshold: Threshold on difference between intensity of the central pixel and pixels on a circle around this pixel.
 
-    :param nonmaxSupression: If it is true, non-maximum supression is applied to detected corners (keypoints).
+    :param nonmaxSupression: If it is true, non-maximum suppression is applied to detected corners (keypoints).
 
     :param keypointsRatio: Inner buffer size for keypoints store is determined as (keypointsRatio * image_width * image_height).
 
@@ -188,7 +188,7 @@ Finds the keypoints using FAST detector.
     :param keypoints: The output vector of keypoints. Can be stored both in CPU and GPU memory. For GPU memory:
 
             * keypoints.ptr<Vec2s>(LOCATION_ROW)[i] will contain location of i'th point
-            * keypoints.ptr<float>(RESPONSE_ROW)[i] will contaion response of i'th point (if non-maximum supression is applied)
+            * keypoints.ptr<float>(RESPONSE_ROW)[i] will contain response of i'th point (if non-maximum suppression is applied)
 
 
 
@@ -238,7 +238,7 @@ Gets final array of keypoints.
 
     :param keypoints: The output vector of keypoints.
 
-The function performs nonmax supression if needed and returns final count of keypoints.
+The function performs non-max suppression if needed and returns final count of keypoints.
 
 
 
@@ -529,7 +529,7 @@ Converts matrices obtained via :ocv:func:`gpu::BruteForceMatcher_GPU::matchSingl
 
 gpu::BruteForceMatcher_GPU::knnMatch
 ----------------------------------------
-Finds the k best matches for each descriptor from a query set with train descriptors.
+Finds the ``k`` best matches for each descriptor from a query set with train descriptors.
 
 .. ocv:function:: void gpu::BruteForceMatcher_GPU::knnMatch(const GpuMat& query, const GpuMat& train, std::vector< std::vector<DMatch> >&matches, int k, const GpuMat& mask = GpuMat(), bool compactResult = false)
 
@@ -551,7 +551,7 @@ Finds the k best matches for each descriptor from a query set with train descrip
 
     :param stream: Stream for the asynchronous version.
 
-The function returns detected k (or less if not possible) matches in the increasing order by distance.
+The function returns detected ``k`` (or less if not possible) matches in the increasing order by distance.
 
 The third variant of the method stores the results in GPU memory.
 

modules/gpu/doc/image_filtering.rst

@@ -109,7 +109,7 @@ By using ``FilterEngine_GPU`` instead of functions you can avoid unnecessary mem
     filter.release();
 
 
-``FilterEngine_GPU`` can process a rectangular sub-region of an image. By default, if ``roi == Rect(0,0,-1,-1)`` , ``FilterEngine_GPU`` processes the inner region of an image ( ``Rect(anchor.x, anchor.y, src_size.width - ksize.width, src_size.height - ksize.height)`` ) because some filters do not check whether indices are outside the image for better perfomance. See below to understand which filters support processing the whole image and which do not and identify image type limitations.
+``FilterEngine_GPU`` can process a rectangular sub-region of an image. By default, if ``roi == Rect(0,0,-1,-1)`` , ``FilterEngine_GPU`` processes the inner region of an image ( ``Rect(anchor.x, anchor.y, src_size.width - ksize.width, src_size.height - ksize.height)`` ) because some filters do not check whether indices are outside the image for better performance. See below to understand which filters support processing the whole image and which do not and identify image type limitations.
 
 .. note:: The GPU filters do not support the in-place mode.
 
@@ -469,7 +469,7 @@ Creates a primitive column filter with the specified kernel.
 
 .. ocv:function:: Ptr<BaseColumnFilter_GPU> gpu::getLinearColumnFilter_GPU(int bufType, int dstType, const Mat& columnKernel, int anchor = -1, int borderType = BORDER_CONSTANT)
 
-    :param bufType: Inermediate buffer type with as many channels as  ``dstType`` .
+    :param bufType: Intermediate buffer type with as many channels as  ``dstType`` .
 
     :param dstType: Destination array type. ``CV_8UC1`` , ``CV_8UC4`` , ``CV_16SC1`` , ``CV_16SC2`` , ``CV_16SC3`` , ``CV_32SC1`` , ``CV_32FC1`` destination types are supported.
 
@@ -581,7 +581,7 @@ Applies the generalized Sobel operator to an image.
 
     :param dy: Derivative order in respect of y.
 
-    :param ksize: Size of the extended Sobel kernel. Possible valies are 1, 3, 5 or 7.
+    :param ksize: Size of the extended Sobel kernel. Possible values are 1, 3, 5 or 7.
 
     :param scale: Optional scale factor for the computed derivative values. By default, no scaling is applied. For details, see  :ocv:func:`getDerivKernels` .
 

modules/gpu/doc/image_processing.rst

@@ -61,7 +61,7 @@ Performs a mean-shift segmentation of the source image and eliminates small segm
 
     :param sr: Color window radius.
 
-    :param minsize: Minimum segment size. Smaller segements are merged.
+    :param minsize: Minimum segment size. Smaller segments are merged.
 
     :param criteria: Termination criteria. See :ocv:class:`TermCriteria`.
 
@@ -229,7 +229,7 @@ The source matrix should be continuous, otherwise reallocation and data copying
 
     * If the source matrix is complex and the output is not specified as real, the destination matrix is complex and has the ``dft_size``    size and ``CV_32FC2``    type. The destination matrix contains a full result of the DFT (forward or inverse).
 
-    * If the source matrix is complex and the output is specified as real, the function assumes that its input is the result of the forward transform (see the next item). The destionation matrix has the ``dft_size`` size and ``CV_32FC1`` type. It contains the result of the inverse DFT.
+    * If the source matrix is complex and the output is specified as real, the function assumes that its input is the result of the forward transform (see the next item). The destination matrix has the ``dft_size`` size and ``CV_32FC1`` type. It contains the result of the inverse DFT.
 
     * If the source matrix is real (its type is ``CV_32FC1`` ), forward DFT is performed. The result of the DFT is packed into complex ( ``CV_32FC2`` ) matrix. So, the width of the destination matrix is ``dft_size.width / 2 + 1`` . But if the source is a single column, the height is reduced instead of the width.
 
@@ -392,7 +392,7 @@ Converts an image from one color space to another.
 
     :param stream: Stream for the asynchronous version.
 
-3-channel color spaces (like ``HSV``, ``XYZ``, and so on) can be stored in a 4-channel image for better perfomance.
+3-channel color spaces (like ``HSV``, ``XYZ``, and so on) can be stored in a 4-channel image for better performance.
 
 .. seealso:: :ocv:func:`cvtColor`
 
@@ -499,7 +499,7 @@ gpu::buildWarpAffineMaps
 ------------------------
 Builds transformation maps for affine transformation.
 
-.. ocv:function:: void buildWarpAffineMaps(const Mat& M, bool inverse, Size dsize, GpuMat& xmap, GpuMat& ymap, Stream& stream = Stream::Null());
+.. ocv:function:: void buildWarpAffineMaps(const Mat& M, bool inverse, Size dsize, GpuMat& xmap, GpuMat& ymap, Stream& stream = Stream::Null())
 
     :param M: *2x3*  transformation matrix.
 
@@ -543,7 +543,7 @@ gpu::buildWarpPerspectiveMaps
 -----------------------------
 Builds transformation maps for perspective transformation.
 
-.. ocv:function:: void buildWarpAffineMaps(const Mat& M, bool inverse, Size dsize, GpuMat& xmap, GpuMat& ymap, Stream& stream = Stream::Null());
+.. ocv:function:: void buildWarpAffineMaps(const Mat& M, bool inverse, Size dsize, GpuMat& xmap, GpuMat& ymap, Stream& stream = Stream::Null())
 
     :param M: *3x3*  transformation matrix.
 

modules/gpu/doc/introduction.rst

@@ -43,7 +43,7 @@ Utilizing Multiple GPUs
 -----------------------
 
 In the current version, each of the OpenCV GPU algorithms can use only a single GPU. So, to utilize multiple GPUs, you have to manually distribute the work between GPUs. 
-Switching active devie can be done using :ocv:func:`gpu::setDevice()' function.  For more details please read Cuda C Programing Guid.
+Switching active devie can be done using :ocv:func:`gpu::setDevice()` function.  For more details please read Cuda C Programing Guide.
 
 While developing algorithms for multiple GPUs, note a data passing overhead. For primitive functions and small images, it can be significant, which may eliminate all the advantages of having multiple GPUs. But for high-level algorithms, consider using multi-GPU acceleration. For example, the Stereo Block Matching algorithm has been successfully parallelized using the following algorithm:
 

modules/gpu/doc/operations_on_matrices.rst

@@ -191,9 +191,9 @@ Computes polar angles of complex matrix elements.
 
     :param y: Source matrix containing imaginary components ( ``CV_32FC1`` ).
 
-    :param angle: Destionation matrix of angles ( ``CV_32FC1`` ).
+    :param angle: Destination matrix of angles ( ``CV_32FC1`` ).
 
-    :param angleInDegrees: Flag for angles that must be evaluated in degress.
+    :param angleInDegrees: Flag for angles that must be evaluated in degrees.
 
     :param stream: Stream for the asynchronous version.
 
@@ -213,9 +213,9 @@ Converts Cartesian coordinates into polar.
 
     :param magnitude: Destination matrix of float magnitudes ( ``CV_32FC1`` ).
 
-    :param angle: Destionation matrix of angles ( ``CV_32FC1`` ).
+    :param angle: Destination matrix of angles ( ``CV_32FC1`` ).
 
-    :param angleInDegrees: Flag for angles that must be evaluated in degress.
+    :param angleInDegrees: Flag for angles that must be evaluated in degrees.
 
     :param stream: Stream for the asynchronous version.
 
@@ -237,7 +237,7 @@ Converts polar coordinates into Cartesian.
 
     :param y: Destination matrix of imaginary components ( ``CV_32FC1`` ).
 
-    :param angleInDegrees: Flag that indicates angles in degress.
+    :param angleInDegrees: Flag that indicates angles in degrees.
 
     :param stream: Stream for the asynchronous version.