Merge pull request #280 from vpisarev:bug_fixes_jan9

b81d1b25 · Andrey Kamaev · OpenCV Buildbot · 399c20a9 · e383d395 · b81d1b25
Commit b81d1b25 authored Jan 10, 2013 by Andrey Kamaev Committed by OpenCV Buildbot Jan 10, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

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

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