ipp: added support for updated ICV package

2014-04-08 14:01:44 +04:00
parent ced81b9121
commit 1461ab41bc
4 changed files with 155 additions and 135 deletions
--- a/modules/core/include/opencv2/core/private.hpp
+++ b/modules/core/include/opencv2/core/private.hpp
@@ -211,8 +211,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"
-#    include "ippicv_fn_map.h"
 #  else
 #    include "ipp.h"
 #  endif