potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Merge branch 2.4

Browse Source
This commit is contained in:
Andrey Kamaev
2013-01-11 15:43:50 +04:00
parent 19229f2fa0 5e2726fb17
commit 084b1c7969
25 changed files with 556 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/src/histogram.cpp
+1 -1
View File
@@ -3023,7 +3023,7 @@ public:
localHistogram[t0]++; localHistogram[t1]++;
}
for (; x < width; ++x, ++ptr)
for (; x < width; ++x)
localHistogram[ptr[x]]++;
}
modules/imgproc/src/templmatch.cpp
+3
View File
@@ -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 )