Merge pull request #280 from vpisarev:bug_fixes_jan9

2013-01-10 13:31:04 +04:00
parent 399c20a928 e383d39598
commit b81d1b25c7
1 changed files with 3 additions and 0 deletions
--- a/modules/imgproc/src/templmatch.cpp
+++ b/modules/imgproc/src/templmatch.cpp
@@ -346,7 +346,10 @@ void cv::matchTemplate( InputArray _img, InputArray _templ, OutputArray _result,
                }

                if( numType == 2 )
+                {
                    num = wndSum2 - 2*num + templSum2;
+                    num = MAX(num, 0.);
+                }
            }

            if( isNormed )