Merged the trunk till r8291

2012-05-18 12:18:17 +00:00
parent caddd398e6
commit 50ad690993
25 changed files with 143 additions and 64 deletions
--- a/modules/gpu/test/test_video.cpp
+++ b/modules/gpu/test/test_video.cpp
@@ -375,7 +375,7 @@ TEST_P(FarnebackOpticalFlow, Accuracy)

    EXPECT_MAT_SIMILAR(flowxy[0], d_flowx, 0.1);
    EXPECT_MAT_SIMILAR(flowxy[1], d_flowy, 0.1);
-};
+}

 INSTANTIATE_TEST_CASE_P(GPU_Video, FarnebackOpticalFlow, testing::Combine(
    ALL_DEVICES,