Add IPP_VERSION_X100 define

2014-04-08 12:43:57 +04:00
parent 7badc85b60
commit f23134ce01
8 changed files with 16 additions and 13 deletions
--- a/modules/core/include/opencv2/core/private.hpp
+++ b/modules/core/include/opencv2/core/private.hpp
@@ -216,12 +216,15 @@ CV_EXPORTS void scalarToRawData(const cv::Scalar& s, void* buf, int type, int un
 #  else
 #    include "ipp.h"
 #  endif
+#  define IPP_VERSION_X100 (IPP_VERSION_MAJOR * 100 + IPP_VERSION_MINOR)

 static inline IppiSize ippiSize(int width, int height)
 {
    IppiSize size = { width, height };
    return size;
 }
+#else
+#  define IPP_VERSION_X100 0
 #endif

 #ifndef IPPI_CALL