generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2679 from alalek:ippicv_update

Browse Source
This commit is contained in:
Alexander Alekhin
2014-05-07 18:24:40 +04:00
committed by OpenCV Buildbot
parent 9c780260c2 71f871fafd
commit 07d5f56707
27 changed files with 119 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/core/include/opencv2/core/private.hpp
View File

@@ -210,12 +210,8 @@ CV_EXPORTS void scalarToRawData(const cv::Scalar& s, void* buf, int type, int un
\****************************************************************************************/
#ifdef HAVE_IPP
# ifdef HAVE_IPP_ICV_ONLY
# include "ipp_redefine.h"
# include "ippicv.h"
# else
# include "ipp.h"
# endif
# include "ipp.h"
# define IPP_VERSION_X100 (IPP_VERSION_MAJOR * 100 + IPP_VERSION_MINOR)
#define IPP_ALIGN 32 // required for AVX optimization