This commit is contained in:
Elena Gvozdeva 2014-01-28 16:22:42 +04:00
parent 1391ca1da5
commit 0edd0aaf69
3 changed files with 4 additions and 6 deletions

View File

@ -852,7 +852,7 @@ void BackgroundSubtractorMOG2Impl::getBackgroundImage(OutputArray backgroundImag
{
if (ocl_getBackgroundImage(backgroundImage));
return;
opencl_ON = false;
return;
}

View File

@ -67,7 +67,7 @@ __kernel void mog2_kernel(__global const uchar* frame, int frame_step, int frame
__global uchar* variance, int var_step, int var_offset, //float
__global uchar* fgmask, int fgmask_step, int fgmask_offset, //int
float alphaT, float alpha1, float prune,
int detectShadows_flag,
int detectShadows_flag,
float c_Tb, float c_TB, float c_Tg, float c_varMin, //constants
float c_varMax, float c_varInit, float c_tau, uchar c_shadowVal)
{

View File

@ -28,7 +28,7 @@ namespace
IMPLEMENT_PARAM_CLASS(DetectShadow, bool)
}
PARAM_TEST_CASE(Mog2, UseGray, DetectShadow, bool)
PARAM_TEST_CASE(Mog2, UseGray, DetectShadow)
{
bool useGray;
bool detectShadow;
@ -37,7 +37,6 @@ PARAM_TEST_CASE(Mog2, UseGray, DetectShadow, bool)
{
useGray = GET_PARAM(0);
detectShadow = GET_PARAM(1);
useRoi = GET_PARAM(2);
}
};
@ -116,8 +115,7 @@ OCL_TEST_P(Mog2, getBackgroundImage)
OCL_INSTANTIATE_TEST_CASE_P(OCL_Video, Mog2, Combine(
Values(UseGray(true), UseGray(false)),
Values(DetectShadow(true), DetectShadow(false)),
Bool())
Values(DetectShadow(true), DetectShadow(false)))
);
}}// namespace cvtest::ocl