griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: IMB_scale Box filter for 2px images

Browse Source 
Just-introduced in #126390, when source image size is just two pixels
it should not advance to the third pixel after reading the first two.
Was pointed out by randomly failing tests, yay tests.
This commit is contained in:
Aras Pranckevicius
2024-08-19 20:31:05 +03:00
parent 852b3dbff3
commit 0a4666dee2
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/imbuf/intern/scaling.cc
View File

@@ -509,8 +509,10 @@ struct ScaleUpX {
float4 val = load_pixel(src_ptr);
float4 nval = load_pixel(src_ptr + 1);
float4 diff = nval - val;
src_ptr += 2;
counter += 2;
if (ibufx > 2) {
src_ptr += 2;
counter += 2;
}
for (int x = 0; x < newx; x++) {
if (sample >= 1.0f) {
sample -= 1.0f;
@@ -558,8 +560,10 @@ struct ScaleUpY {
float4 val = load_pixel(src_ptr);
float4 nval = load_pixel(src_ptr + ibufx);
float4 diff = nval - val;
src_ptr += ibufx * 2;
counter += 2;
if (ibufy > 2) {
src_ptr += ibufx * 2;
counter += 2;
}
for (int y = 0; y < newy; y++) {
if (sample >= 1.0f) {

5
source/blender/imbuf/tests/IMB_scaling_test.cc
View File

@@ -181,7 +181,10 @@ TEST(imbuf_scaling, bilinear_fractional_larger)
EXPECT_EQ(uint4(got[7 + 0 * res->x]), uint4(52, 100, 16, 255));
EXPECT_EQ(uint4(got[2 + 2 * res->x]), uint4(235, 55, 51, 215));
EXPECT_EQ(uint4(got[3 + 2 * res->x]), uint4(153, 55, 35, 54));
EXPECT_EQ(uint4(got[8 + 6 * res->x]), uint4(37, 0, 62, 162));
EXPECT_EQ(uint4(got[8 + 5 * res->x]), uint4(57, 0, 91, 252));
EXPECT_EQ(uint4(got[0 + 6 * res->x]), uint4(164, 164, 0, 255));
EXPECT_EQ(uint4(got[7 + 6 * res->x]), uint4(55, 36, 57, 254));
EXPECT_EQ(uint4(got[8 + 6 * res->x]), uint4(56, 0, 73, 253));
IMB_freeImBuf(res);
}