Merge pull request #4151 from lupustr3:pvlasov/ipp_alignment

8298644b · Alexander Alekhin · 56e637d5 · 8439b594 · 8298644b
Commit 8298644b authored Jun 24, 2015 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

private.hpp modules/core/include/opencv2/core/private.hpp +4 -1

No files found.
--- 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__)