Merge pull request #2563 from alalek:ipp_builds

2014-04-07 13:03:10 +04:00
parent def4f5e2a3 bfc546d23c
commit c2f859569c
8 changed files with 189 additions and 322 deletions
--- a/modules/core/src/arithm.cpp
+++ b/modules/core/src/arithm.cpp
@@ -52,18 +52,6 @@
 namespace cv
 {

-#if ARITHM_USE_IPP
-struct IPPArithmInitializer
-{
-    IPPArithmInitializer(void)
-    {
-        ippStaticInit();
-    }
-};
-
-IPPArithmInitializer ippArithmInitializer;
-#endif
-
 struct NOP {};

 #if CV_SSE2
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@@ -274,7 +274,14 @@ volatile bool useOptimizedFlag = true;
 #ifdef HAVE_IPP
 struct IPPInitializer
 {
-    IPPInitializer(void) { ippStaticInit(); }
+    IPPInitializer(void)
+    {
+#if IPP_VERSION_MAJOR >= 8
+        ippInit();
+#else
+        ippStaticInit();
+#endif
+    }
 };

 IPPInitializer ippInitializer;