restored SSE2 and added AVX optimization of the old haar face detector

95967461 · Vadim Pisarevsky · dea52eb7 · 95967461 · 95967461
Commit 95967461 authored Sep 04, 2012 by Vadim Pisarevsky
Expand all Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

system.cpp modules/core/src/system.cpp +1 -1

haar.cpp modules/objdetect/src/haar.cpp +0 -0

No files found.
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@@ -178,7 +178,7 @@ struct HWFeatures
            f.have[CV_CPU_SSE4_1] = (cpuid_data[2] & (1<<19)) != 0;
            f.have[CV_CPU_SSE4_2] = (cpuid_data[2] & (1<<20)) != 0;
            f.have[CV_CPU_POPCNT] = (cpuid_data[2] & (1<<23)) != 0;
-            f.have[CV_CPU_AVX]    = (cpuid_data[2] & (1<<28)) != 0;
+            f.have[CV_CPU_AVX]    = (((cpuid_data[2] & (1<<28)) != 0)&&((cpuid_data[2] & (1<<27)) != 0));//OS uses XSAVE_XRSTORE and CPU support AVX
        }
        return f;

--- a/modules/objdetect/src/haar.cpp
+++ b/modules/objdetect/src/haar.cpp