mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-28 05:06:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/video/src/bgfg_gaussmix2.cpp
View File

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

2
modules/video/src/opencl/bgfg_mog2.cl
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* variance, int var_step, int var_offset, //float
__global uchar* fgmask, int fgmask_step, int fgmask_offset, //int __global uchar* fgmask, int fgmask_step, int fgmask_offset, //int
float alphaT, float alpha1, float prune, 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_Tb, float c_TB, float c_Tg, float c_varMin, //constants
float c_varMax, float c_varInit, float c_tau, uchar c_shadowVal) float c_varMax, float c_varInit, float c_tau, uchar c_shadowVal)
{ {

6
modules/video/test/ocl/test_bgfg_mog2.cpp
View File

@ -28,7 +28,7 @@ namespace
IMPLEMENT_PARAM_CLASS(DetectShadow, bool) IMPLEMENT_PARAM_CLASS(DetectShadow, bool)
} }
PARAM_TEST_CASE(Mog2, UseGray, DetectShadow, bool) PARAM_TEST_CASE(Mog2, UseGray, DetectShadow)
{ {
bool useGray; bool useGray;
bool detectShadow; bool detectShadow;
@ -37,7 +37,6 @@ PARAM_TEST_CASE(Mog2, UseGray, DetectShadow, bool)
{ {
useGray = GET_PARAM(0); useGray = GET_PARAM(0);
detectShadow = GET_PARAM(1); 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( OCL_INSTANTIATE_TEST_CASE_P(OCL_Video, Mog2, Combine(
Values(UseGray(true), UseGray(false)), Values(UseGray(true), UseGray(false)),
Values(DetectShadow(true), DetectShadow(false)), Values(DetectShadow(true), DetectShadow(false)))
Bool())
); );
}}// namespace cvtest::ocl }}// namespace cvtest::ocl