ipp: some functions are not available in the ICV package #2

2014-04-09 16:01:51 +04:00
parent 0d477ffea1
commit ab691a4a24
8 changed files with 22 additions and 22 deletions
--- a/modules/core/src/convert.cpp
+++ b/modules/core/src/convert.cpp
@@ -1079,7 +1079,7 @@ dtype* dst, size_t dstep, Size size, double* scale) \
    cvtScale_(src, sstep, dst, dstep, size, (wtype)scale[0], (wtype)scale[1]); \
 }

-#ifdef HAVE_IPP
+#if defined(HAVE_IPP) && !defined(HAVE_IPP_ICV_ONLY)
 #define DEF_CVT_FUNC_F(suffix, stype, dtype, ippFavor) \
 static void cvt##suffix( const stype* src, size_t sstep, const uchar*, size_t, \
                         dtype* dst, size_t dstep, Size size, double*) \