fixed
authorElena Gvozdeva <elena.gvozdeva@itseez.com>
Tue, 28 Jan 2014 12:22:42 +0000 (16:22 +0400)
committerElena Gvozdeva <elena.gvozdeva@itseez.com>
Tue, 28 Jan 2014 12:23:39 +0000 (16:23 +0400)
modules/video/src/bgfg_gaussmix2.cpp
modules/video/src/opencl/bgfg_mog2.cl
modules/video/test/ocl/test_bgfg_mog2.cpp

index cfdce37..2534645 100644 (file)
@@ -852,7 +852,7 @@ void BackgroundSubtractorMOG2Impl::getBackgroundImage(OutputArray backgroundImag
     {
         if (ocl_getBackgroundImage(backgroundImage));
             return;
-        
+
         opencl_ON = false;
         return;
     }
index 6ae278b..f895b5b 100644 (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)
 {
index a0d811b..e9a73cb 100644 (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