generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed bug #1629

Browse Source
This commit is contained in:
Marina Kolpakova
2012-03-19 11:29:29 +00:00
parent 3228599a35
commit e50c0ed4c8
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/video/include/opencv2/video/tracking.hpp
View File

@@ -322,7 +322,6 @@ CV_EXPORTS_W void calcOpticalFlowPyrLK( InputArray prevImg, InputArray nextImg,
TermCriteria criteria=TermCriteria( TermCriteria criteria=TermCriteria(
TermCriteria::COUNT+TermCriteria::EPS, TermCriteria::COUNT+TermCriteria::EPS,
30, 0.01), 30, 0.01),
double derivLambda=0.5,
int flags=0, int flags=0,
double minEigThreshold=1e-4); double minEigThreshold=1e-4);

5
modules/video/src/lkpyramid.cpp
View File

@@ -498,18 +498,15 @@ void cv::calcOpticalFlowPyrLK( InputArray _prevImg, InputArray _nextImg,
OutputArray _status, OutputArray _err, OutputArray _status, OutputArray _err,
Size winSize, int maxLevel, Size winSize, int maxLevel,
TermCriteria criteria, TermCriteria criteria,
double derivLambda,
int flags, double minEigThreshold ) int flags, double minEigThreshold )
{ {
#ifdef HAVE_TEGRA_OPTIMIZATION #ifdef HAVE_TEGRA_OPTIMIZATION
if (tegra::calcOpticalFlowPyrLK(_prevImg, _nextImg, _prevPts, _nextPts, _status, _err, winSize, maxLevel, criteria, derivLambda, flags, minEigThreshold)) if (tegra::calcOpticalFlowPyrLK(_prevImg, _nextImg, _prevPts, _nextPts, _status, _err, winSize, maxLevel, criteria, flags, minEigThreshold))
return; return;
#endif #endif
Mat prevImg = _prevImg.getMat(), nextImg = _nextImg.getMat(), prevPtsMat = _prevPts.getMat(); Mat prevImg = _prevImg.getMat(), nextImg = _nextImg.getMat(), prevPtsMat = _prevPts.getMat();
derivLambda = std::min(std::max(derivLambda, 0.), 1.);
const int derivDepth = DataType<deriv_type>::depth; const int derivDepth = DataType<deriv_type>::depth;
CV_Assert( derivLambda >= 0 );
CV_Assert( maxLevel >= 0 && winSize.width > 2 && winSize.height > 2 ); CV_Assert( maxLevel >= 0 && winSize.width > 2 && winSize.height > 2 );
CV_Assert( prevImg.size() == nextImg.size() && CV_Assert( prevImg.size() == nextImg.size() &&
prevImg.type() == nextImg.type() ); prevImg.type() == nextImg.type() );