Merge branch 2.4

2013-01-11 15:43:50 +04:00
parent 19229f2fa0 5e2726fb17
commit 084b1c7969
25 changed files with 556 additions and 359 deletions
--- a/modules/imgproc/src/histogram.cpp
+++ b/modules/imgproc/src/histogram.cpp
@@ -3023,7 +3023,7 @@ public:
                localHistogram[t0]++; localHistogram[t1]++;
            }

-            for (; x < width; ++x, ++ptr)
+            for (; x < width; ++x)
                localHistogram[ptr[x]]++;
        }

--- 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 )