From 0edd0aaf69cb06eaaff1f05b3fddcff58f0c4238 Mon Sep 17 00:00:00 2001 From: Elena Gvozdeva Date: Tue, 28 Jan 2014 16:22:42 +0400 Subject: [PATCH] fixed --- modules/video/src/bgfg_gaussmix2.cpp | 2 +- modules/video/src/opencl/bgfg_mog2.cl | 2 +- modules/video/test/ocl/test_bgfg_mog2.cpp | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/video/src/bgfg_gaussmix2.cpp b/modules/video/src/bgfg_gaussmix2.cpp index cfdce37ac8..2534645b13 100644 --- a/modules/video/src/bgfg_gaussmix2.cpp +++ b/modules/video/src/bgfg_gaussmix2.cpp @@ -852,7 +852,7 @@ void BackgroundSubtractorMOG2Impl::getBackgroundImage(OutputArray backgroundImag { if (ocl_getBackgroundImage(backgroundImage)); return; - + opencl_ON = false; return; } diff --git a/modules/video/src/opencl/bgfg_mog2.cl b/modules/video/src/opencl/bgfg_mog2.cl index 6ae278bbb4..f895b5be73 100644 --- a/modules/video/src/opencl/bgfg_mog2.cl +++ b/modules/video/src/opencl/bgfg_mog2.cl @@ -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) { diff --git a/modules/video/test/ocl/test_bgfg_mog2.cpp b/modules/video/test/ocl/test_bgfg_mog2.cpp index a0d811b127..e9a73cb9b7 100644 --- a/modules/video/test/ocl/test_bgfg_mog2.cpp +++ b/modules/video/test/ocl/test_bgfg_mog2.cpp @@ -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