Merge branch 'cuda_concurrency' into tvl1_chambolle

2014-07-31 16:08:57 +02:00
parent 5623701acb ae26368e78
commit 7b8bb4248b
437 changed files with 10444 additions and 13214 deletions
--- a/modules/cudaoptflow/test/test_optflow.cpp
+++ b/modules/cudaoptflow/test/test_optflow.cpp
@@ -381,7 +381,6 @@ INSTANTIATE_TEST_CASE_P(CUDA_OptFlow, OpticalFlowDual_TVL1, testing::Combine(
    ALL_DEVICES,
    WHOLE_SUBMAT));

-
 //////////////////////////////////////////////////////
 // FastOpticalFlowBM