generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#1205 fixed more bugs/typos in parameters

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gpu/doc/image_processing.rst
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.