Merge pull request #16600 from alalek:revert_16497

pull/16612/head
Alexander Alekhin 5 years ago
commit 5ad9e5f9bc
  1. 2
      modules/imgproc/src/resize.cpp
  2. 2
      modules/imgproc/test/test_imgwarp.cpp

@ -1045,7 +1045,7 @@ public:
{ {
const int* _tS = (const int*)(S + x_ofs[x]); const int* _tS = (const int*)(S + x_ofs[x]);
int* _tD = (int*)D; int* _tD = (int*)D;
for( int k = 0; k <= pix_size4; k++ ) for( int k = 0; k < pix_size4; k++ )
_tD[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, nearest_regression_15075) TEST(Resize, DISABLED_nearest_regression_15075) // reverted https://github.com/opencv/opencv/pull/16497
{ {
const int C = 5; const int C = 5;
const int i1 = 5, j1 = 5; const int i1 = 5, j1 = 5;

Loading…
Cancel
Save