From f52126725f46f8c2232276f90c3edc814cc3f86d Mon Sep 17 00:00:00 2001 From: vbystricky Date: Mon, 21 Apr 2014 14:43:56 +0400 Subject: [PATCH] Disable scharr in icv only configuration --- modules/imgproc/src/deriv.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/imgproc/src/deriv.cpp b/modules/imgproc/src/deriv.cpp index 8dd7f4c..e338e72 100644 --- a/modules/imgproc/src/deriv.cpp +++ b/modules/imgproc/src/deriv.cpp @@ -192,6 +192,9 @@ namespace cv #if (IPP_VERSION_X100 >= 801) 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) + return false; +#else if ((0 > dx) || (0 > dy) || (1 != dx + dy)) return false; if (fabs(delta) > FLT_EPSILON) @@ -302,6 +305,7 @@ static bool IPPDerivScharr(InputArray _src, OutputArray _dst, int ddepth, int dx sts = ippiMulC_32f_C1R((Ipp32f *)dst.data, (int)dst.step, (Ipp32f)scale, (Ipp32f *)dst.data, (int)dst.step, roiSize); } return (0 <= sts); +#endif } #elif (IPP_VERSION_MAJOR >= 7) static bool IPPDerivScharr(InputArray _src, OutputArray _dst, int ddepth, int dx, int dy, double scale, double delta, int borderType) -- 2.7.4