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

Fix warning

Browse Source
This commit is contained in:
vbystricky
2014-04-15 10:00:08 +04:00
parent 160c964e4b
commit 79384beb60
1 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -193,27 +193,15 @@ static bool IPPDerivScharr(InputArray _src, OutputArray _dst, int ddepth, int dx
{ {
if ((0 > dx) || (0 > dy) || (1 != dx + dy)) if ((0 > dx) || (0 > dy) || (1 != dx + dy))
return false; return false;
if (fabs(delta) > 0.0001) if (fabs(delta) > FLT_EPSILON)
return false; return false;
IppiBorderType ippiBorderType; IppiBorderType ippiBorderType = ippiGetBorderType(borderType & (~BORDER_ISOLATED));
switch (borderType & (~BORDER_ISOLATED)) if ((ippBorderRepl != ippiBorderType) &&
{ (ippBorderMirrorR != ippiBorderType) &&
case BORDER_REPLICATE: (ippBorderWrap != ippiBorderType) &&
ippiBorderType = (IppiBorderType)ippBorderRepl; (ippBorderMirror != ippiBorderType))
break;
case BORDER_REFLECT:
ippiBorderType = (IppiBorderType)ippBorderMirrorR;
break;
case BORDER_WRAP:
ippiBorderType = (IppiBorderType)ippBorderWrap;
break;
case BORDER_REFLECT_101:
ippiBorderType = (IppiBorderType)ippBorderMirror;
break;
default:
return false; return false;
};
int stype = _src.type(), sdepth = CV_MAT_DEPTH(stype), cn = CV_MAT_CN(stype); int stype = _src.type(), sdepth = CV_MAT_DEPTH(stype), cn = CV_MAT_CN(stype);
if (ddepth < 0) if (ddepth < 0)
@@ -293,7 +281,7 @@ static bool IPPDerivScharr(InputArray _src, OutputArray _dst, int ddepth, int dx
ippsFree(pBuffer); ippsFree(pBuffer);
if (0 > sts) if (0 > sts)
return false; return false;
if ((CV_32F == dtype) && (0.0001 < fabs(scale - 1.0))) if ((CV_32F == dtype) && (FLT_EPSILON < fabs(scale - 1.0)))
ippiMulC_32f_C1R((Ipp32f *)dst.data, (int)dst.step, (Ipp32f)scale, (Ipp32f *)dst.data, (int)dst.step, roiSize); ippiMulC_32f_C1R((Ipp32f *)dst.data, (int)dst.step, (Ipp32f)scale, (Ipp32f *)dst.data, (int)dst.step, roiSize);
return true; return true;
} }