generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add setIppErrorStatus()

Browse Source
This commit is contained in:
vbystricky
2014-04-18 15:13:34 +04:00
parent d17f40dc1f
commit 650762419c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/imgproc/src/deriv.cpp
View File

@@ -412,12 +412,14 @@ static bool IPPDerivScharr(InputArray _src, OutputArray _dst, int ddepth, int dx
} }
#endif #endif
static bool IPPDerivSobel(InputArray _src, OutputArray _dst, int ddepth, int dx, int dy, int ksize, double scale, double delta) static bool IPPDerivSobel(InputArray _src, OutputArray _dst, int ddepth, int dx, int dy, int ksize, double scale, double delta, int borderType)
{ {
if (ksize != 3 && ksize != 5) if ((borderType != BORDER_REPLICATE) || (3 != ksize) || (5 != ksize))
return false; return false;
if (fabs(delta) > FLT_EPSILON) if (fabs(delta) > FLT_EPSILON)
return false; return false;
if (1 != _src.channels())
return false;
int bufSize = 0; int bufSize = 0;
cv::AutoBuffer<char> buffer; cv::AutoBuffer<char> buffer;
@@ -579,11 +581,13 @@ void cv::Sobel( InputArray _src, OutputArray _dst, int ddepth, int dx, int dy,
{ {
if (IPPDerivScharr(_src, _dst, ddepth, dx, dy, scale, delta, borderType)) if (IPPDerivScharr(_src, _dst, ddepth, dx, dy, scale, delta, borderType))
return; return;
setIppErrorStatus();
} }
else if (0 < ksize && cn == 1 && borderType == BORDER_REPLICATE) else if (0 < ksize)
{ {
if (IPPDerivSobel(_src, _dst, ddepth, dx, dy, ksize, scale, delta)) if (IPPDerivSobel(_src, _dst, ddepth, dx, dy, ksize, scale, delta, borderType))
return; return;
setIppErrorStatus();
} }
#endif #endif
int ktype = std::max(CV_32F, std::max(ddepth, sdepth)); int ktype = std::max(CV_32F, std::max(ddepth, sdepth));