Merge pull request #2146 from SpecLad:merge-2.4

2014-01-17 16:28:29 +04:00
parent 659c5345d9 092f916db9
commit 79fcc06a4b
50 changed files with 323 additions and 312 deletions
--- a/modules/ts/include/opencv2/ts/ts_perf.hpp
+++ b/modules/ts/include/opencv2/ts/ts_perf.hpp
@@ -255,7 +255,7 @@ enum PERF_STRATEGY
 {
    PERF_STRATEGY_DEFAULT = -1,
    PERF_STRATEGY_BASE = 0,
-    PERF_STRATEGY_SIMPLE = 1,
+    PERF_STRATEGY_SIMPLE = 1
 };