Merge branch 4.x

modules/imgproc/include/opencv2/imgproc.hpp

@@ -235,8 +235,9 @@ enum MorphShapes {
     MORPH_RECT    = 0, //!< a rectangular structuring element:  \f[E_{ij}=1\f]
     MORPH_CROSS   = 1, //!< a cross-shaped structuring element:
                        //!< \f[E_{ij} = \begin{cases} 1 & \texttt{if } {i=\texttt{anchor.y } {or } {j=\texttt{anchor.x}}} \\0 & \texttt{otherwise} \end{cases}\f]
-    MORPH_ELLIPSE = 2 //!< an elliptic structuring element, that is, a filled ellipse inscribed
+    MORPH_ELLIPSE = 2, //!< an elliptic structuring element, that is, a filled ellipse inscribed
                       //!< into the rectangle Rect(0, 0, esize.width, esize.height)
+    MORPH_DIAMOND = 3  //!< a diamond structuring element defined by Manhattan distance
 };
 
 //! @} imgproc_filter
@@ -2944,9 +2945,9 @@ Calculates the cross-power spectrum of two supplied source arrays. The arrays ar
 with getOptimalDFTSize.
 
 The function performs the following equations:
-- First it applies a Hanning window (see <https://en.wikipedia.org/wiki/Hann_function>) to each
-image to remove possible edge effects. This window is cached until the array size changes to speed
-up processing time.
+- First it applies a Hanning window to each image to remove possible edge effects, if it's provided
+by user. See @ref createHanningWindow and <https://en.wikipedia.org/wiki/Hann_function>. This window may
+be cached until the array size changes to speed up processing time.
 - Next it computes the forward DFTs of each source array:
 \f[\mathbf{G}_a = \mathcal{F}\{src_1\}, \; \mathbf{G}_b = \mathcal{F}\{src_2\}\f]
 where \f$\mathcal{F}\f$ is the forward DFT.