From 9bc5afd27823f2b1af726cdc6148a84555711192 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Mon, 21 May 2012 13:57:36 +0000 Subject: [PATCH] Updated tegra optical flow stub --- modules/video/src/lkpyramid.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/video/src/lkpyramid.cpp b/modules/video/src/lkpyramid.cpp index 8c43706733..52a23b2e20 100644 --- a/modules/video/src/lkpyramid.cpp +++ b/modules/video/src/lkpyramid.cpp @@ -584,10 +584,6 @@ void cv::calcOpticalFlowPyrLK( InputArray _prevImg, InputArray _nextImg, TermCriteria criteria, int flags, double minEigThreshold ) { -#ifdef HAVE_TEGRA_OPTIMIZATION - if (tegra::calcOpticalFlowPyrLK(_prevImg, _nextImg, _prevPts, _nextPts, _status, _err, winSize, maxLevel, criteria, flags, minEigThreshold)) - return; -#endif Mat prevPtsMat = _prevPts.getMat(); const int derivDepth = DataType::depth; @@ -731,7 +727,11 @@ void cv::calcOpticalFlowPyrLK( InputArray _prevImg, InputArray _nextImg, CV_Assert(prevPyr[level * lvlStep1].size() == nextPyr[level * lvlStep2].size()); CV_Assert(prevPyr[level * lvlStep1].type() == nextPyr[level * lvlStep2].type()); - typedef cv::detail::LKTrackerInvoker LKTrackerInvoker; +#ifdef HAVE_TEGRA_OPTIMIZATION + typedef tegra::LKTrackerInvoker LKTrackerInvoker; +#else + typedef cv::detail::LKTrackerInvoker LKTrackerInvoker; +#endif parallel_for(BlockedRange(0, npoints), LKTrackerInvoker(prevPyr[level * lvlStep1], derivI, nextPyr[level * lvlStep2], prevPts, nextPts,