fix the bug when src*2 < dst

pull/22194/head
@lizhiyu3 3 years ago
parent 2920a8e0ec
commit 79731cb0ff
  1. 12
      modules/imgproc/src/pyramids.cpp
  2. 37
      modules/imgproc/test/test_pyramid.cpp

@ -983,6 +983,8 @@ pyrUp_( const Mat& _src, Mat& _dst, int)
row0 = rows[0]; row1 = rows[1]; row2 = rows[2]; row0 = rows[0]; row1 = rows[1]; row2 = rows[2];
dsts[0] = dst0; dsts[1] = dst1; dsts[0] = dst0; dsts[1] = dst1;
if (dst0 != dst1)
{
x = PyrUpVecV<WT, T>(rows, dsts, dsize.width); x = PyrUpVecV<WT, T>(rows, dsts, dsize.width);
for( ; x < dsize.width; x++ ) for( ; x < dsize.width; x++ )
{ {
@ -991,6 +993,16 @@ pyrUp_( const Mat& _src, Mat& _dst, int)
dst1[x] = t1; dst0[x] = t0; dst1[x] = t1; dst0[x] = t0;
} }
} }
else
{
for(x = 0; x < dsize.width; x++ )
{
T t0 = castOp(row0[x] + row1[x]*6 + row2[x]);
dst0[x] = t0;
}
}
}
if (dsize.height > ssize.height*2) if (dsize.height > ssize.height*2)
{ {

@ -8,12 +8,41 @@ namespace opencv_test { namespace {
TEST(Imgproc_PyrUp, pyrUp_regression_22184) TEST(Imgproc_PyrUp, pyrUp_regression_22184)
{ {
Mat src(100, 100, CV_16UC3, Scalar::all(255)); Mat src(100,100,CV_16UC3,Scalar(255,255,255));
Mat dst(100 * 2 + 1, 100 * 2 + 1, CV_16UC3, Scalar::all(0)); Mat dst(100 * 2 + 1, 100 * 2 + 1, CV_16UC3, Scalar(0,0,0));
pyrUp(src, dst, Size(dst.cols, dst.rows)); pyrUp(src, dst, Size(dst.cols, dst.rows));
double min_val = 0; double min_val;
minMaxLoc(dst, &min_val); minMaxLoc(dst, &min_val);
ASSERT_GT(cvRound(min_val), 0); ASSERT_GT(cvRound(min_val), 0);
} }
}} // namespace TEST(Imgproc_PyrUp, pyrUp_regression_22193)
{
Mat src(13, 13,CV_16UC3,Scalar(0,0,0));
{
int swidth = src.cols;
int sheight = src.rows;
int cn = src.channels();
int count = 0;
for (int y = 0; y < sheight; y++)
{
ushort *src_c = src.ptr<ushort>(y);
for (int x = 0; x < swidth * cn; x++)
{
src_c[x] = (count++) % 10;
}
}
}
Mat dst(src.cols * 2 - 1, src.rows * 2 - 1, CV_16UC3, Scalar(0,0,0));
pyrUp(src, dst, Size(dst.cols, dst.rows));
{
ushort *dst_c = dst.ptr<ushort>(dst.rows - 1);
ASSERT_EQ(dst_c[0], 6);
ASSERT_EQ(dst_c[1], 6);
ASSERT_EQ(dst_c[2], 1);
}
}
}
}

Loading…
Cancel
Save