Merge pull request #9580 from mshabunin:fix-static-6

This commit is contained in:
Alexander Alekhin
2017-09-09 19:31:21 +00:00
41 changed files with 252 additions and 218 deletions

View File

@@ -1976,7 +1976,7 @@ public:
// Disable AVX1 since we don't track regressions for it. SSE42 will be used instead
if(cpuFeatures&ippCPUID_AVX && !(cpuFeatures&ippCPUID_AVX2))
ippFeatures &= ~ippCPUID_AVX;
ippFeatures &= ~((Ipp64u)ippCPUID_AVX);
// IPP integrations in OpenCV support only SSE4.2, AVX2 and AVX-512 optimizations.
if(!(