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

Merge pull request #2800 from krodyush:pullreq/140516-opticalflow-imgext-fix

Browse Source
This commit is contained in:
Alexander Alekhin 2014-05-30 16:35:23 +04:00 committed by OpenCV Buildbot
commit 6126788535
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -895,8 +895,8 @@ namespace cv
int pitchAlign = (int)ocl::Device::getDefault().imagePitchAlignment(); int pitchAlign = (int)ocl::Device::getDefault().imagePitchAlignment();
if (pitchAlign>0) if (pitchAlign>0)
{ {
prevPyr[0] = UMat(prevImg.rows,(prevImg.cols+pitchAlign-1)&(-pitchAlign),prevImg.type()).colRange(0,prevImg.cols); prevPyr[0] = UMat(prevImg.rows,(prevImg.cols+pitchAlign-1)&(-pitchAlign),CV_32FC1).colRange(0,prevImg.cols);
nextPyr[0] = UMat(nextImg.rows,(nextImg.cols+pitchAlign-1)&(-pitchAlign),nextImg.type()).colRange(0,nextImg.cols); nextPyr[0] = UMat(nextImg.rows,(nextImg.cols+pitchAlign-1)&(-pitchAlign),CV_32FC1).colRange(0,nextImg.cols);
for (int level = 1; level <= maxLevel; ++level) for (int level = 1; level <= maxLevel; ++level)
{ {
int cols,rows; int cols,rows;