Skip to content

Commit e1322cf

Browse files
committed
Merge pull request opencv#16928 from alalek:fix_15075
2 parents 67dfdee + be17f53 commit e1322cf

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

modules/imgproc/src/resize.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,10 +1043,9 @@ class resizeNNInvoker :
10431043
default:
10441044
for( x = 0; x < dsize.width; x++, D += pix_size )
10451045
{
1046-
const int* _tS = (const int*)(S + x_ofs[x]);
1047-
int* _tD = (int*)D;
1048-
for( int k = 0; k < pix_size4; k++ )
1049-
_tD[k] = _tS[k];
1046+
const uchar* _tS = S + x_ofs[x];
1047+
for (int k = 0; k < pix_size; k++)
1048+
D[k] = _tS[k];
10501049
}
10511050
}
10521051
}

modules/imgproc/test/test_imgwarp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1721,7 +1721,7 @@ TEST(Resize, lanczos4_regression_16192)
17211721
EXPECT_EQ(cvtest::norm(dst, expected, NORM_INF), 0) << dst(Rect(0,0,8,8));
17221722
}
17231723

1724-
TEST(Resize, DISABLED_nearest_regression_15075) // reverted https://github.com/opencv/opencv/pull/16497
1724+
TEST(Resize, nearest_regression_15075)
17251725
{
17261726
const int C = 5;
17271727
const int i1 = 5, j1 = 5;

0 commit comments

Comments
 (0)