From 8439b5942bd01ddb36043187eab807f58ce0a64b Mon Sep 17 00:00:00 2001 From: Pavel Vlasov Date: Wed, 24 Jun 2015 09:21:35 +0300 Subject: [PATCH] Proper IPP alignment; --- modules/core/include/opencv2/core/private.hpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/core/include/opencv2/core/private.hpp b/modules/core/include/opencv2/core/private.hpp index 4f9f487778..72f4ddc02c 100644 --- a/modules/core/include/opencv2/core/private.hpp +++ b/modules/core/include/opencv2/core/private.hpp @@ -195,7 +195,10 @@ CV_EXPORTS void scalarToRawData(const cv::Scalar& s, void* buf, int type, int un # define IPP_VERSION_X100 (IPP_VERSION_MAJOR * 100 + IPP_VERSION_MINOR) -#define IPP_ALIGN 32 // required for AVX optimization +#ifdef CV_MALLOC_ALIGN +#undef CV_MALLOC_ALIGN +#endif +#define CV_MALLOC_ALIGN 32 // required for AVX optimization #define setIppErrorStatus() cv::ipp::setIppStatus(-1, CV_Func, __FILE__, __LINE__)