Merge pull request #2836 from s98felix:2.4

2014-07-25 12:59:40 +00:00
parent 38b3698b97 de37cfc224
commit fc41e8850b
14 changed files with 1231 additions and 317 deletions
--- a/modules/ts/src/ts_func.cpp
+++ b/modules/ts/src/ts_func.cpp
@@ -3002,9 +3002,8 @@ void printVersionInfo(bool useStdOut)
 #if CV_SSE4_2
    if (checkHardwareSupport(CV_CPU_SSE4_2)) cpu_features += " sse4.2";
 #endif
-#if CV_AVX
    if (checkHardwareSupport(CV_CPU_AVX)) cpu_features += " avx";
-#endif
+    if (checkHardwareSupport(CV_CPU_AVX2)) cpu_features += " avx2";
 #if CV_NEON
    cpu_features += " neon"; // NEON is currently not checked at runtime
 #endif