Merge pull request #1568 from ilya-lavrenov:ocl_pyrlk

modules/ocl/perf/perf_bgfg.cpp

@@ -191,7 +191,7 @@ PERF_TEST_P(VideoMOG2Fixture, MOG2,
         TEST_CYCLE()
         {
             cv::Ptr<cv::BackgroundSubtractorMOG2> mog2 = createBackgroundSubtractorMOG2();
-            mog2->set("detectShadows", false);
+            mog2->setDetectShadows(false);
             foreground.release();
 
             for (int i = 0; i < nFrame; i++)
@@ -253,7 +253,7 @@ PERF_TEST_P(Video_MOG2GetBackgroundImage, MOG2,
         TEST_CYCLE()
         {
             cv::Ptr<cv::BackgroundSubtractorMOG2> mog2 = createBackgroundSubtractorMOG2();
-            mog2->set("detectShadows", false);
+            mog2->setDetectShadows(false);
             foreground.release();
             background.release();
             for (int i = 0; i < nFrame; i++)

modules/ocl/test/test_bgfg.cpp

@@ -168,7 +168,7 @@ TEST_P(mog2, Update)
     cv::ocl::oclMat foreground = createMat_ocl(frame.size(), CV_8UC1, useRoi);
 
     cv::Ptr<cv::BackgroundSubtractorMOG2> mog2_gold = createBackgroundSubtractorMOG2();
-    mog2_gold->set("detectShadows", detectShadow);
+    mog2_gold->setDetectShadows(detectShadow);
     cv::Mat foreground_gold;
 
     for (int i = 0; i < 10; ++i)
@@ -210,7 +210,7 @@ TEST_P(mog2, getBackgroundImage)
     cv::ocl::oclMat foreground;
 
     cv::Ptr<cv::BackgroundSubtractorMOG2> mog2_gold = createBackgroundSubtractorMOG2();
-    mog2_gold->set("detectShadows", detectShadow);
+    mog2_gold->setDetectShadows(detectShadow);
     cv::Mat foreground_gold;
 
     for (int i = 0; i < 10; ++i)

modules/ocl/test/test_optflow.cpp

@@ -251,7 +251,6 @@ TEST_P(Sparse, Mat)
             cv::Point2i b = nextPts_gold[i];
 
             bool eq = std::abs(a.x - b.x) < 1 && std::abs(a.y - b.y) < 1;
-            //float errdiff = std::abs(err[i] - err_gold[i]);
             float errdiff = 0.0f;
 
             if (!eq || errdiff > 1e-1)
@@ -262,12 +261,10 @@ TEST_P(Sparse, Mat)
     double bad_ratio = static_cast<double>(mistmatch) / (nextPts.size());
 
     ASSERT_LE(bad_ratio, 0.02f);
-
 }
 
-INSTANTIATE_TEST_CASE_P(OCL_Video, Sparse, Combine(
-    Values(false, true),
-    Values(false, true)));
+INSTANTIATE_TEST_CASE_P(OCL_Video, Sparse, Combine(Bool(), Bool()));
+
 //////////////////////////////////////////////////////
 // FarnebackOpticalFlow