imgproc(resize): fix resizeNNInvoker handling of generic pixel size

pull/16928/head
Alexander Alekhin 5 years ago
parent 222a48577f
commit be17f532e1
  1. 7
      modules/imgproc/src/resize.cpp
  2. 2
      modules/imgproc/test/test_imgwarp.cpp

@ -1043,10 +1043,9 @@ public:
default: default:
for( x = 0; x < dsize.width; x++, D += pix_size ) for( x = 0; x < dsize.width; x++, D += pix_size )
{ {
const int* _tS = (const int*)(S + x_ofs[x]); const uchar* _tS = S + x_ofs[x];
int* _tD = (int*)D; for (int k = 0; k < pix_size; k++)
for( int k = 0; k < pix_size4; k++ ) D[k] = _tS[k];
_tD[k] = _tS[k];
} }
} }
} }

@ -1721,7 +1721,7 @@ TEST(Resize, lanczos4_regression_16192)
EXPECT_EQ(cvtest::norm(dst, expected, NORM_INF), 0) << dst(Rect(0,0,8,8)); EXPECT_EQ(cvtest::norm(dst, expected, NORM_INF), 0) << dst(Rect(0,0,8,8));
} }
TEST(Resize, DISABLED_nearest_regression_15075) // reverted https://github.com/opencv/opencv/pull/16497 TEST(Resize, nearest_regression_15075)
{ {
const int C = 5; const int C = 5;
const int i1 = 5, j1 = 5; const int i1 = 5, j1 = 5;

Loading…
Cancel
Save