From e7b9cfa8f2923142165ac5385560c6aad3a3cdc6 Mon Sep 17 00:00:00 2001 From: berak Date: Wed, 16 Aug 2017 08:51:34 +0200 Subject: [PATCH] imgproc:fix winSize in createHanningWindow() --- modules/imgproc/include/opencv2/imgproc.hpp | 2 +- modules/imgproc/src/phasecorr.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/imgproc/include/opencv2/imgproc.hpp b/modules/imgproc/include/opencv2/imgproc.hpp index 1c86adb17c..323b0051a7 100644 --- a/modules/imgproc/include/opencv2/imgproc.hpp +++ b/modules/imgproc/include/opencv2/imgproc.hpp @@ -2723,7 +2723,7 @@ An example is shown below: createHanningWindow(hann, Size(100, 100), CV_32F); @endcode @param dst Destination array to place Hann coefficients in -@param winSize The window size specifications +@param winSize The window size specifications (both width and height must be > 1) @param type Created array type */ CV_EXPORTS_W void createHanningWindow(OutputArray dst, Size winSize, int type); diff --git a/modules/imgproc/src/phasecorr.cpp b/modules/imgproc/src/phasecorr.cpp index 0b02a1ec1e..64ad527cb7 100644 --- a/modules/imgproc/src/phasecorr.cpp +++ b/modules/imgproc/src/phasecorr.cpp @@ -579,6 +579,7 @@ void cv::createHanningWindow(OutputArray _dst, cv::Size winSize, int type) CV_INSTRUMENT_REGION() CV_Assert( type == CV_32FC1 || type == CV_64FC1 ); + CV_Assert( winSize.width > 1 && winSize.height > 1 ); _dst.create(winSize, type); Mat dst = _dst.getMat();