Skip to content

O
opencv
Commit f5212672 authored by vbystricky's avatar vbystricky
Browse files
Options

Disable scharr in icv only configuration

parent d97f7da7
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
modules/imgproc/src/deriv.cpp
View file @ f5212672
...@@ -192,6 +192,9 @@ namespace cv ...@@ -192,6 +192,9 @@ namespace cv
#if (IPP_VERSION_X100 >= 801) #if (IPP_VERSION_X100 >= 801)
static bool IPPDerivScharr(InputArray _src, OutputArray _dst, int ddepth, int dx, int dy, double scale, double delta, int borderType) 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)) if ((0 > dx) || (0 > dy) || (1 != dx + dy))
return false; return false;
if (fabs(delta) > FLT_EPSILON) if (fabs(delta) > FLT_EPSILON)
...@@ -302,6 +305,7 @@ static bool IPPDerivScharr(InputArray _src, OutputArray _dst, int ddepth, int dx ...@@ -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); sts = ippiMulC_32f_C1R((Ipp32f *)dst.data, (int)dst.step, (Ipp32f)scale, (Ipp32f *)dst.data, (int)dst.step, roiSize);
} }
return (0 <= sts); return (0 <= sts);
#endif
} }
#elif (IPP_VERSION_MAJOR >= 7) #elif (IPP_VERSION_MAJOR >= 7)
static bool IPPDerivScharr(InputArray _src, OutputArray _dst, int ddepth, int dx, int dy, double scale, double delta, int borderType) static bool IPPDerivScharr(InputArray _src, OutputArray _dst, int ddepth, int dx, int dy, double scale, double delta, int borderType)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment