Commit 38913bf5 authored by vbystricky's avatar vbystricky

Change all 'ippStsNoErr==' to '0<=', and all 'ippStsNoErr!=' to '0>'

parent 67484e02
...@@ -1276,14 +1276,14 @@ static void Exp_64f( const double *_x, double *y, int n ) ...@@ -1276,14 +1276,14 @@ static void Exp_64f( const double *_x, double *y, int n )
#ifdef HAVE_IPP #ifdef HAVE_IPP
static void Exp_32f_ipp(const float *x, float *y, int n) static void Exp_32f_ipp(const float *x, float *y, int n)
{ {
if (ippStsNoErr == ippsExp_32f_A21(x, y, n)) if (0 <= ippsExp_32f_A21(x, y, n))
return; return;
Exp_32f(x, y, n); Exp_32f(x, y, n);
} }
static void Exp_64f_ipp(const double *x, double *y, int n) static void Exp_64f_ipp(const double *x, double *y, int n)
{ {
if (ippStsNoErr == ippsExp_64f_A50(x, y, n)) if (0 <= ippsExp_64f_A50(x, y, n))
return; return;
Exp_64f(x, y, n); Exp_64f(x, y, n);
} }
...@@ -1934,14 +1934,14 @@ static void Log_64f( const double *x, double *y, int n ) ...@@ -1934,14 +1934,14 @@ static void Log_64f( const double *x, double *y, int n )
#ifdef HAVE_IPP #ifdef HAVE_IPP
static void Log_32f_ipp(const float *x, float *y, int n) static void Log_32f_ipp(const float *x, float *y, int n)
{ {
if (ippStsNoErr == ippsLn_32f_A21(x, y, n)) if (0 <= ippsLn_32f_A21(x, y, n))
return; return;
Log_32f(x, y, n); Log_32f(x, y, n);
} }
static void Log_64f_ipp(const double *x, double *y, int n) static void Log_64f_ipp(const double *x, double *y, int n)
{ {
if (ippStsNoErr == ippsLn_64f_A50(x, y, n)) if (0 <= ippsLn_64f_A50(x, y, n))
return; return;
Log_64f(x, y, n); Log_64f(x, y, n);
} }
......
This diff is collapsed.
...@@ -1161,11 +1161,11 @@ static bool IPPMorphReplicate(int op, const Mat &src, Mat &dst, const Mat &kerne ...@@ -1161,11 +1161,11 @@ static bool IPPMorphReplicate(int op, const Mat &src, Mat &dst, const Mat &kerne
case cvtype: \ case cvtype: \
{\ {\
int specSize = 0, bufferSize = 0;\ int specSize = 0, bufferSize = 0;\
if (ippStsNoErr != ippiMorphologyBorderGetSize_##flavor(roiSize.width, kernelSize, &specSize, &bufferSize))\ if (0 > ippiMorphologyBorderGetSize_##flavor(roiSize.width, kernelSize, &specSize, &bufferSize))\
return false;\ return false;\
IppiMorphState *pSpec = (IppiMorphState*)ippMalloc(specSize);\ IppiMorphState *pSpec = (IppiMorphState*)ippMalloc(specSize);\
Ipp8u *pBuffer = (Ipp8u*)ippMalloc(bufferSize);\ Ipp8u *pBuffer = (Ipp8u*)ippMalloc(bufferSize);\
if (ippStsNoErr != ippiMorphologyBorderInit_##flavor(roiSize.width, kernel.data, kernelSize, pSpec, pBuffer))\ if (0 > ippiMorphologyBorderInit_##flavor(roiSize.width, kernel.data, kernelSize, pSpec, pBuffer))\
{\ {\
ippFree(pBuffer);\ ippFree(pBuffer);\
ippFree(pSpec);\ ippFree(pSpec);\
...@@ -1173,10 +1173,10 @@ static bool IPPMorphReplicate(int op, const Mat &src, Mat &dst, const Mat &kerne ...@@ -1173,10 +1173,10 @@ static bool IPPMorphReplicate(int op, const Mat &src, Mat &dst, const Mat &kerne
}\ }\
bool ok = false;\ bool ok = false;\
if (op == MORPH_ERODE)\ if (op == MORPH_ERODE)\
ok = (ippStsNoErr == ippiErodeBorder_##flavor((Ipp##data_type *)_src->data, (int)_src->step[0], (Ipp##data_type *)dst.data, (int)dst.step[0],\ ok = (0 <= ippiErodeBorder_##flavor((Ipp##data_type *)_src->data, (int)_src->step[0], (Ipp##data_type *)dst.data, (int)dst.step[0],\
roiSize, ippBorderRepl, 0, pSpec, pBuffer));\ roiSize, ippBorderRepl, 0, pSpec, pBuffer));\
else\ else\
ok = (ippStsNoErr == ippiDilateBorder_##flavor((Ipp##data_type *)_src->data, (int)_src->step[0], (Ipp##data_type *)dst.data, (int)dst.step[0],\ ok = (0 <= ippiDilateBorder_##flavor((Ipp##data_type *)_src->data, (int)_src->step[0], (Ipp##data_type *)dst.data, (int)dst.step[0],\
roiSize, ippBorderRepl, 0, pSpec, pBuffer));\ roiSize, ippBorderRepl, 0, pSpec, pBuffer));\
ippFree(pBuffer);\ ippFree(pBuffer);\
ippFree(pSpec);\ ippFree(pSpec);\
...@@ -1192,7 +1192,7 @@ static bool IPPMorphReplicate(int op, const Mat &src, Mat &dst, const Mat &kerne ...@@ -1192,7 +1192,7 @@ static bool IPPMorphReplicate(int op, const Mat &src, Mat &dst, const Mat &kerne
{\ {\
int specSize = 0;\ int specSize = 0;\
int bufferSize = 0;\ int bufferSize = 0;\
if (ippStsNoErr != ippiMorphologyGetSize_##flavor( roiSize.width, kernel.data kernelSize, &specSize))\ if (0 > ippiMorphologyGetSize_##flavor( roiSize.width, kernel.data kernelSize, &specSize))\
return false;\ return false;\
bool ok = false;\ bool ok = false;\
IppiMorphState* pState = (IppiMorphState*)ippMalloc(specSize);\ IppiMorphState* pState = (IppiMorphState*)ippMalloc(specSize);\
...@@ -1234,13 +1234,13 @@ static bool IPPMorphReplicate(int op, const Mat &src, Mat &dst, const Mat &kerne ...@@ -1234,13 +1234,13 @@ static bool IPPMorphReplicate(int op, const Mat &src, Mat &dst, const Mat &kerne
case cvtype: \ case cvtype: \
{\ {\
int bufSize = 0;\ int bufSize = 0;\
if (ippStsNoErr != ippiFilterMinGetBufferSize_##flavor(src.cols, kernelSize, &bufSize))\ if (0 > ippiFilterMinGetBufferSize_##flavor(src.cols, kernelSize, &bufSize))\
return false;\ return false;\
AutoBuffer<uchar> buf(bufSize + 64);\ AutoBuffer<uchar> buf(bufSize + 64);\
uchar* buffer = alignPtr((uchar*)buf, 32);\ uchar* buffer = alignPtr((uchar*)buf, 32);\
if (op == MORPH_ERODE)\ if (op == MORPH_ERODE)\
return (ippStsNoErr == ippiFilterMinBorderReplicate_##flavor((Ipp##data_type *)_src->data, (int)_src->step[0], (Ipp##data_type *)dst.data, (int)dst.step[0], roiSize, kernelSize, point, buffer));\ return (0 <= ippiFilterMinBorderReplicate_##flavor((Ipp##data_type *)_src->data, (int)_src->step[0], (Ipp##data_type *)dst.data, (int)dst.step[0], roiSize, kernelSize, point, buffer));\
return (ippStsNoErr == ippiFilterMaxBorderReplicate_##flavor((Ipp##data_type *)_src->data, (int)_src->step[0], (Ipp##data_type *)dst.data, (int)dst.step[0], roiSize, kernelSize, point, buffer));\ return (0 <= ippiFilterMaxBorderReplicate_##flavor((Ipp##data_type *)_src->data, (int)_src->step[0], (Ipp##data_type *)dst.data, (int)dst.step[0], roiSize, kernelSize, point, buffer));\
}\ }\
break; break;
......
...@@ -1115,18 +1115,18 @@ void cv::GaussianBlur( InputArray _src, OutputArray _dst, Size ksize, ...@@ -1115,18 +1115,18 @@ void cv::GaussianBlur( InputArray _src, OutputArray _dst, Size ksize,
Mat src = _src.getMat(), dst = _dst.getMat(); Mat src = _src.getMat(), dst = _dst.getMat();
IppiSize roi = { src.cols, src.rows }; IppiSize roi = { src.cols, src.rows };
int specSize = 0, bufferSize = 0; int specSize = 0, bufferSize = 0;
if (ippStsNoErr == ippiFilterGaussianGetBufferSize(roi, (Ipp32u)ksize.width, ipp32f, 1, &specSize, &bufferSize)) if (0 <= ippiFilterGaussianGetBufferSize(roi, (Ipp32u)ksize.width, ipp32f, 1, &specSize, &bufferSize))
{ {
IppFilterGaussianSpec *pSpec = (IppFilterGaussianSpec*)ippMalloc(specSize); IppFilterGaussianSpec *pSpec = (IppFilterGaussianSpec*)ippMalloc(specSize);
Ipp8u *pBuffer = (Ipp8u*)ippMalloc(bufferSize); Ipp8u *pBuffer = (Ipp8u*)ippMalloc(bufferSize);
if (ippStsNoErr == ippiFilterGaussianInit(roi, (Ipp32u)ksize.width, (Ipp32f)sigma1, (IppiBorderType)borderType, ipp32f, 1, pSpec, pBuffer)) if (0 <= ippiFilterGaussianInit(roi, (Ipp32u)ksize.width, (Ipp32f)sigma1, (IppiBorderType)borderType, ipp32f, 1, pSpec, pBuffer))
{ {
IppStatus sts = ippiFilterGaussianBorder_32f_C1R( (const Ipp32f *)src.data, (int)src.step, IppStatus sts = ippiFilterGaussianBorder_32f_C1R( (const Ipp32f *)src.data, (int)src.step,
(Ipp32f *)dst.data, (int)dst.step, (Ipp32f *)dst.data, (int)dst.step,
roi, 0.0, pSpec, pBuffer); roi, 0.0, pSpec, pBuffer);
ippFree(pBuffer); ippFree(pBuffer);
ippFree(pSpec); ippFree(pSpec);
if (ippStsNoErr == sts) if (0 <= sts)
return; return;
} }
} }
...@@ -2187,19 +2187,19 @@ public: ...@@ -2187,19 +2187,19 @@ public:
IppiSize kernel = {d, d}; IppiSize kernel = {d, d};
IppiSize roi={dst.cols, range.end - range.start}; IppiSize roi={dst.cols, range.end - range.start};
int bufsize=0; int bufsize=0;
if (ippStsNoErr != ippiFilterBilateralGetBufSize_8u_C1R( ippiFilterBilateralGauss, roi, kernel, &bufsize)) if (0 > ippiFilterBilateralGetBufSize_8u_C1R( ippiFilterBilateralGauss, roi, kernel, &bufsize))
{ {
*ok = false; *ok = false;
return; return;
} }
AutoBuffer<uchar> buf(bufsize); AutoBuffer<uchar> buf(bufsize);
IppiFilterBilateralSpec *pSpec = (IppiFilterBilateralSpec *)alignPtr(&buf[0], 32); IppiFilterBilateralSpec *pSpec = (IppiFilterBilateralSpec *)alignPtr(&buf[0], 32);
if (ippStsNoErr != ippiFilterBilateralInit_8u_C1R( ippiFilterBilateralGauss, kernel, (Ipp32f)sigma_color, (Ipp32f)sigma_space, 1, pSpec )) if (0 > ippiFilterBilateralInit_8u_C1R( ippiFilterBilateralGauss, kernel, (Ipp32f)sigma_color, (Ipp32f)sigma_space, 1, pSpec ))
{ {
*ok = false; *ok = false;
return; return;
} }
if (ippStsNoErr != ippiFilterBilateral_8u_C1R( src.ptr<uchar>(range.start) + radius * ((int)src.step[0] + 1), (int)src.step[0], dst.ptr<uchar>(range.start), (int)dst.step[0], roi, kernel, pSpec )) if (0 > ippiFilterBilateral_8u_C1R( src.ptr<uchar>(range.start) + radius * ((int)src.step[0] + 1), (int)src.step[0], dst.ptr<uchar>(range.start), (int)dst.step[0], roi, kernel, pSpec ))
*ok = false; *ok = false;
} }
private: private:
......
...@@ -389,7 +389,7 @@ void cv::integral( InputArray _src, OutputArray _sum, OutputArray _sqsum, Output ...@@ -389,7 +389,7 @@ void cv::integral( InputArray _src, OutputArray _sum, OutputArray _sqsum, Output
status = ippiIntegral_8u32s_C1R( (const Ipp8u*)src.data, (int)src.step, (Ipp32s*)sum.data, (int)sum.step, srcRoiSize, 0 ); status = ippiIntegral_8u32s_C1R( (const Ipp8u*)src.data, (int)src.step, (Ipp32s*)sum.data, (int)sum.step, srcRoiSize, 0 );
} }
} }
if (ippStsNoErr == status) if (0 <= status)
return; return;
} }
#endif #endif
......
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