Merge branch '2.4'

2013-02-22 17:33:30 +04:00
parent 0ccdc5b4af e6dd4e840d
commit 0b8a6da817
47 changed files with 669 additions and 376 deletions
--- a/modules/video/perf/perf_tvl1optflow.cpp
+++ b/modules/video/perf/perf_tvl1optflow.cpp
@@ -13,7 +13,7 @@ pair<string, string> impair(const char* im1, const char* im2)

 PERF_TEST_P(ImagePair, OpticalFlowDual_TVL1, testing::Values(impair("cv/optflow/RubberWhale1.png", "cv/optflow/RubberWhale2.png")))
 {
-    declare.time(40);
+    declare.time(260);

    Mat frame1 = imread(getDataPath(GetParam().first), IMREAD_GRAYSCALE);
    Mat frame2 = imread(getDataPath(GetParam().second), IMREAD_GRAYSCALE);