Merge pull request #1080 from hhofbaue:matchTemplate_bugfix

12 years ago · f0c7cce87a
parent a0f6e1ba1d a26c4fa2a2
commit f0c7cce87a
1 changed files with 2 additions and 0 deletions
--- a/modules/imgproc/src/templmatch.cpp
+++ b/modules/imgproc/src/templmatch.cpp
@ -248,6 +248,8 @@ void cv::matchTemplate( InputArray _img, InputArray _templ, OutputArray _result,
    CV_Assert( (img.depth() == CV_8U || img.depth() == CV_32F) &&
               img.type() == templ.type() );

+    CV_Assert( img.rows >= templ.rows && img.cols >= templ.cols);
+
    Size corrSize(img.cols - templ.cols + 1, img.rows - templ.rows + 1);
    _result.create(corrSize, CV_32F);
    Mat result = _result.getMat();