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

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2019-06-07 19:02:55 +03:00
parent f3de2b4be7 254f88f805
commit ddcf388270
43 changed files with 446 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/video/src/ecc.cpp
+1 -1
View File
@@ -550,7 +550,7 @@ double cv::findTransformECC(InputArray templateImage,
const double correlation = templateZM.dot(imageWarped);
// calculate enhanced correlation coefficiont (ECC)->rho
// calculate enhanced correlation coefficient (ECC)->rho
last_rho = rho;
rho = correlation/(imgNorm*tmpNorm);
if (cvIsNaN(rho)) {
modules/video/src/lkpyramid.cpp
+2 -2
View File
@@ -1281,7 +1281,7 @@ void SparsePyrLKOpticalFlowImpl::calc( InputArray _prevImg, InputArray _nextImg,
levels1 /= 2;
}
// ensure that pyramid has reqired padding
// ensure that pyramid has required padding
if(levels1 > 0)
{
Size fullSize;
@@ -1309,7 +1309,7 @@ void SparsePyrLKOpticalFlowImpl::calc( InputArray _prevImg, InputArray _nextImg,
levels2 /= 2;
}
// ensure that pyramid has reqired padding
// ensure that pyramid has required padding
if(levels2 > 0)
{
Size fullSize;