Skip to content

O
opencv
Commit 5580d08c authored by Alexander Karsakov's avatar Alexander Karsakov
Browse files
Options

Added setIppErrorStatus()

parent 10cb6602
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
modules/imgproc/perf/perf_corners.cpp
View file @ 5580d08c
...@@ -28,8 +28,7 @@ PERF_TEST_P(Img_BlockSize_ApertureSize_k_BorderType, cornerHarris, ...@@ -28,8 +28,7 @@ PERF_TEST_P(Img_BlockSize_ApertureSize_k_BorderType, cornerHarris,
BorderType borderType = get<4>(GetParam()); BorderType borderType = get<4>(GetParam());
Mat src = imread(filename, IMREAD_GRAYSCALE); Mat src = imread(filename, IMREAD_GRAYSCALE);
if (src.empty()) ASSERT_FALSE(src.empty()) << "Unable to load source image: " << filename;
FAIL() << "Unable to load source image" << filename;
Mat dst; Mat dst;
...@@ -56,8 +55,7 @@ PERF_TEST_P(Img_BlockSize_ApertureSize_BorderType, cornerEigenValsAndVecs, ...@@ -56,8 +55,7 @@ PERF_TEST_P(Img_BlockSize_ApertureSize_BorderType, cornerEigenValsAndVecs,
BorderType borderType = get<3>(GetParam()); BorderType borderType = get<3>(GetParam());
Mat src = imread(filename, IMREAD_GRAYSCALE); Mat src = imread(filename, IMREAD_GRAYSCALE);
if (src.empty()) ASSERT_FALSE(src.empty()) << "Unable to load source image: " << filename;
FAIL() << "Unable to load source image" << filename;
Mat dst; Mat dst;
...@@ -84,8 +82,7 @@ PERF_TEST_P(Img_BlockSize_ApertureSize_BorderType, cornerMinEigenVal, ...@@ -84,8 +82,7 @@ PERF_TEST_P(Img_BlockSize_ApertureSize_BorderType, cornerMinEigenVal,
BorderType borderType = get<3>(GetParam()); BorderType borderType = get<3>(GetParam());
Mat src = imread(filename, IMREAD_GRAYSCALE); Mat src = imread(filename, IMREAD_GRAYSCALE);
if (src.empty()) ASSERT_FALSE(src.empty()) << "Unable to load source image: " << filename;
FAIL() << "Unable to load source image" << filename;
Mat dst; Mat dst;
......
modules/imgproc/src/corner.cpp
View file @ 5580d08c
...@@ -461,7 +461,7 @@ void cv::cornerMinEigenVal( InputArray _src, OutputArray _dst, int blockSize, in ...@@ -461,7 +461,7 @@ void cv::cornerMinEigenVal( InputArray _src, OutputArray _dst, int blockSize, in
_dst.create( src.size(), CV_32FC1 ); _dst.create( src.size(), CV_32FC1 );
Mat dst = _dst.getMat(); Mat dst = _dst.getMat();
#if defined(HAVE_IPP) && (IPP_VERSION_MAJOR >= 8) #if defined(HAVE_IPP) && !defined(HAVE_IPP_ICV_ONLY) && (IPP_VERSION_MAJOR >= 8)
typedef IppStatus (CV_STDCALL * ippiMinEigenValGetBufferSize)(IppiSize, int, int, int*); typedef IppStatus (CV_STDCALL * ippiMinEigenValGetBufferSize)(IppiSize, int, int, int*);
typedef IppStatus (CV_STDCALL * ippiMinEigenVal)(const void*, int, Ipp32f*, int, IppiSize, IppiKernelType, int, int, Ipp8u*); typedef IppStatus (CV_STDCALL * ippiMinEigenVal)(const void*, int, Ipp32f*, int, IppiSize, IppiKernelType, int, int, Ipp8u*);
IppiKernelType kerType; IppiKernelType kerType;
...@@ -505,12 +505,13 @@ void cv::cornerMinEigenVal( InputArray _src, OutputArray _dst, int blockSize, in ...@@ -505,12 +505,13 @@ void cv::cornerMinEigenVal( InputArray _src, OutputArray _dst, int blockSize, in
Ipp8u* buffer = ippsMalloc_8u(bufferSize); Ipp8u* buffer = ippsMalloc_8u(bufferSize);
ok = minEigenValFunc(src.data, (int) src.step, (Ipp32f*) dst.data, (int) dst.step, srcRoi, kerType, kerSize, blockSize, buffer); ok = minEigenValFunc(src.data, (int) src.step, (Ipp32f*) dst.data, (int) dst.step, srcRoi, kerType, kerSize, blockSize, buffer);
CV_SUPPRESS_DEPRECATED_START CV_SUPPRESS_DEPRECATED_START
if (ok >= 0) ippiMulC_32f_C1IR(norm_coef, (Ipp32f*) dst.data, (int) dst.step, srcRoi); if (ok >= 0) ok = ippiMulC_32f_C1IR(norm_coef, (Ipp32f*) dst.data, (int) dst.step, srcRoi);
CV_SUPPRESS_DEPRECATED_END CV_SUPPRESS_DEPRECATED_END
ippsFree(buffer); ippsFree(buffer);
if (ok >= 0) if (ok >= 0)
return; return;
} }
setIppErrorStatus();
} }
} }
#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