icv: update package

modules/core/include/opencv2/core/private.hpp

@@ -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

modules/core/src/dxt.cpp

@@ -53,7 +53,7 @@ namespace cv
 # pragma warning(disable: 4748)
 #endif
 
-#if IPP_VERSION_X100 >= 701
+#if IPP_VERSION_X100 >= 701 && !defined(HAVE_IPP_ICV_ONLY)
 #define USE_IPP_DFT 1
 #else
 #undef USE_IPP_DFT

modules/imgproc/src/deriv.cpp

@@ -193,7 +193,7 @@ namespace cv
 static bool IPPDerivScharr(InputArray _src, OutputArray _dst, int ddepth, int dx, int dy, double scale, double delta, int borderType)
 {
 #if defined(HAVE_IPP_ICV_ONLY)
-    _src; _dst; ddepth; dx; dy; scale; delta; borderType;
+    (void)_src; (void)_dst; (void)ddepth; (void)dx; (void)dy; (void)scale; (void)delta; (void)borderType;
     return false;
 #else
     if ((0 > dx) || (0 > dy) || (1 != dx + dy))
@@ -460,6 +460,9 @@ static bool IPPDerivSobel(InputArray _src, OutputArray _dst, int ddepth, int dx,
             return true;
         }
 
+#if defined(HAVE_IPP_ICV_ONLY)
+        return false;
+#else
         if ((dx == 2) && (dy == 0))
         {
             if (0 > ippiFilterSobelVertSecondGetBufferSize_8u16s_C1R(ippiSize(src.cols, src.rows), (IppiMaskSize)(ksize*10+ksize),&bufSize))
@@ -485,6 +488,7 @@ static bool IPPDerivSobel(InputArray _src, OutputArray _dst, int ddepth, int dx,
                 IPP_RETURN_ERROR
             return true;
         }
+#endif
     }
 
     if (src.type() == CV_32F && dst.type() == CV_32F)

modules/imgproc/src/smooth.cpp

@@ -2274,7 +2274,7 @@ private:
     float *space_weight, *color_weight;
 };
 
-#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
+#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7) && !defined(HAVE_IPP_ICV_ONLY)
 class IPPBilateralFilter_8u_Invoker :
     public ParallelLoopBody
 {