Merge pull request #1080 from hhofbaue:matchTemplate_bugfix

f0c7cce8 · Roman Donchenko · OpenCV Buildbot · a0f6e1ba · a26c4fa2 · f0c7cce8
Commit f0c7cce8 authored Jul 10, 2013 by Roman Donchenko Committed by OpenCV Buildbot Jul 10, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

templmatch.cpp modules/imgproc/src/templmatch.cpp +2 -0

No files found.
--- 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();