propagated 2 fixed from 2.4 to trunk

This commit is contained in:
Vadim Pisarevsky
2012-05-11 11:48:26 +00:00
parent 2dafc9a853
commit e794622776
2 changed files with 15 additions and 4 deletions

View File

@@ -1956,7 +1956,7 @@ The function ``mulSpectrums`` performs the per-element multiplication of the two
The function, together with
:ocv:func:`dft` and
:ocv:func:`idft` , may be used to calculate convolution (pass ``conj=false`` ) or correlation (pass ``conj=false`` ) of two arrays rapidly. When the arrays are complex, they are simply multiplied (per element) with an optional conjugation of the second-array elements. When the arrays are real, they are assumed to be CCS-packed (see
:ocv:func:`idft` , may be used to calculate convolution (pass ``conj=false`` ) or correlation (pass ``conj=true`` ) of two arrays rapidly. When the arrays are complex, they are simply multiplied (per element) with an optional conjugation of the second-array elements. When the arrays are real, they are assumed to be CCS-packed (see
:ocv:func:`dft` for details).