merged new master branch

changed tests for tvl1 optflow correction of a bug preventing compilation with cuda (fmin changed to fminf)
2014-08-18 15:29:45 +02:00
parent fae69df9a9
commit 6207d338dd
3 changed files with 10 additions and 5 deletions
--- a/modules/cudaoptflow/perf/perf_optflow.cpp
+++ b/modules/cudaoptflow/perf/perf_optflow.cpp
@@ -378,7 +378,6 @@ PERF_TEST_P(ImagePair, OpticalFlowDual_TVL1,
        alg->set("medianFiltering", 1);
        alg->set("innerIterations", 1);
        alg->set("outerIterations", 300);
-
        TEST_CYCLE() alg->calc(frame0, frame1, flow);

        CPU_SANITY_CHECK(flow);