third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21258 from eplankin:fix_threshold_to_zero_ipp_bug

Browse Source 
Fixed threshold(THRESH_TOZERO) at imgproc(IPP)

* Fixed #16085: imgproc(IPP): wrong result from threshold(THRESH_TOZERO)

* 1. Added test cases with float where all bits of mantissa equal 1, min and max float as inputs
2. Used nextafterf instead of cast to hex

* Used float value in test instead of hex and casts

* Changed input value in test
This commit is contained in:
eplankin 2021-12-17 16:31:37 +03:00 committed by GitHub
parent f071207463
commit 175bcb1734
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/imgproc/src/thresh.cpp
View File

@ -774,16 +774,14 @@ thresh_32f( const Mat& _src, Mat& _dst, float thresh, float maxval, int type )
} }
setIppErrorStatus(); setIppErrorStatus();
break; break;
#if 0 // details: https://github.com/opencv/opencv/pull/16085
case THRESH_TOZERO: case THRESH_TOZERO:
if (0 <= CV_INSTRUMENT_FUN_IPP(ippiThreshold_LTVal_32f_C1R, src, (int)src_step*sizeof(src[0]), dst, (int)dst_step*sizeof(dst[0]), sz, thresh + FLT_EPSILON, 0)) if (0 <= CV_INSTRUMENT_FUN_IPP(ippiThreshold_LTVal_32f_C1R, src, (int)src_step*sizeof(src[0]), dst, (int)dst_step*sizeof(dst[0]), sz, nextafterf(thresh, std::numeric_limits<float>::infinity()), 0))
{ {
CV_IMPL_ADD(CV_IMPL_IPP); CV_IMPL_ADD(CV_IMPL_IPP);
return; return;
} }
setIppErrorStatus(); setIppErrorStatus();
break; break;
#endif
case THRESH_TOZERO_INV: case THRESH_TOZERO_INV:
if (0 <= CV_INSTRUMENT_FUN_IPP(ippiThreshold_GTVal_32f_C1R, src, (int)src_step*sizeof(src[0]), dst, (int)dst_step*sizeof(dst[0]), sz, thresh, 0)) if (0 <= CV_INSTRUMENT_FUN_IPP(ippiThreshold_GTVal_32f_C1R, src, (int)src_step*sizeof(src[0]), dst, (int)dst_step*sizeof(dst[0]), sz, thresh, 0))
{ {

30
modules/imgproc/test/test_thresh.cpp
View File

@ -443,4 +443,34 @@ TEST(Imgproc_Threshold, regression_THRESH_TOZERO_IPP_16085)
EXPECT_EQ(0, cv::norm(result, NORM_INF)); EXPECT_EQ(0, cv::norm(result, NORM_INF));
} }
TEST(Imgproc_Threshold, regression_THRESH_TOZERO_IPP_21258)
{
Size sz(16, 16);
float val = nextafterf(16.0f, 0.0f); // 0x417fffff, all bits in mantissa are 1
Mat input(sz, CV_32F, Scalar::all(val));
Mat result;
cv::threshold(input, result, val, 0.0, THRESH_TOZERO);
EXPECT_EQ(0, cv::norm(result, NORM_INF));
}
TEST(Imgproc_Threshold, regression_THRESH_TOZERO_IPP_21258_Min)
{
Size sz(16, 16);
float min_val = -std::numeric_limits<float>::max();
Mat input(sz, CV_32F, Scalar::all(min_val));
Mat result;
cv::threshold(input, result, min_val, 0.0, THRESH_TOZERO);
EXPECT_EQ(0, cv::norm(result, NORM_INF));
}
TEST(Imgproc_Threshold, regression_THRESH_TOZERO_IPP_21258_Max)
{
Size sz(16, 16);
float max_val = std::numeric_limits<float>::max();
Mat input(sz, CV_32F, Scalar::all(max_val));
Mat result;
cv::threshold(input, result, max_val, 0.0, THRESH_TOZERO);
EXPECT_EQ(0, cv::norm(result, NORM_INF));
}
}} // namespace }} // namespace