Skip to content

Commit

Permalink
Merge pull request opencv#287 from taka-no-me:fix_cvCalcOpticalFlow_2526
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrey Kamaev authored and OpenCV Buildbot committed Jan 10, 2013
2 parents 64d89d3 + b1384a6 commit 5e2726f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions modules/video/src/lkpyramid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1194,8 +1194,8 @@ cvCalcOpticalFlowPyrLK( const void* arrA, const void* arrB,
st = cv::Mat(count, 1, CV_8U, (void*)status);
if( error )
err = cv::Mat(count, 1, CV_32F, (void*)error);
cv::calcOpticalFlowPyrLK( A, B, ptA, ptB, status ? cv::_OutputArray(st) : cv::_OutputArray(),
error ? cv::_OutputArray(err) : cv::_OutputArray(),
cv::calcOpticalFlowPyrLK( A, B, ptA, ptB, st,
error ? cv::_OutputArray(err) : cv::noArray(),
winSize, level, criteria, flags);
}

Expand Down

0 comments on commit 5e2726f

Please sign in to comment.