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

Fix builds errors

Browse Source
This commit is contained in:
vbystricky 2014-01-16 16:24:10 +04:00
parent 33fc46cdec
commit 3ba6636651
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -620,7 +620,7 @@ namespace cv
return false;
if (maxLevel < 0 || winSize.width <= 2 || winSize.height <= 2)
return false;
calcPatchSize(patch);
calcPatchSize();
if (patch.x <= 0 || patch.x >= 6 || patch.y <= 0 || patch.y >= 6)
return false;
if (!initWaveSize())
@ -672,7 +672,21 @@ namespace cv
//bool getMinEigenVals;
private:
void calcPatchSize(dim3 &patch)
int waveSize;
bool initWaveSize()
{
waveSize = 1;
if (isDeviceCPU())
return true;
ocl::Kernel kernel;
if (!kernel.create("lkSparse", cv::ocl::video::pyrlk_oclsrc, ""))
return false;
waveSize = (int)kernel.preferedWorkGroupSizeMultiple();
return true;
}
dim3 patch;
void calcPatchSize()
{
dim3 block;
//winSize.width *= cn;
@ -693,21 +707,7 @@ namespace cv
block.z = patch.z = 1;
}
private:
int waveSize;
dim3 patch;
bool initWaveSize()
{
waveSize = 1;
if (isDeviceCPU())
return true;
ocl::Kernel kernel;
if (!kernel.create("lkSparse", cv::ocl::video::pyrlk_oclsrc, ""))
return false;
waveSize = (int)kernel.preferedWorkGroupSizeMultiple();
return true;
}
bool lkSparse_run(UMat &I, UMat &J, const UMat &prevPts, UMat &nextPts, UMat &status, UMat& err,
int ptcount, int level, dim3 patch)
{