Skip to content

Consider I;16 pixel size when using a 1 mode mask #8112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hugovk merged 1 commit into from
Jun 25, 2024
Merged

Consider I;16 pixel size when using a 1 mode mask #8112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Tests/images/imagedraw_polygon_width_I.tiff
View file
Open in desktop
Binary file not shown.
13 changes: 13 additions & 0 deletions Tests/test_imagedraw.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,19 @@ def test_polygon(points: Coords) -> None:
assert_image_equal_tofile(im, "Tests/images/imagedraw_polygon.png")


@pytest.mark.parametrize("points", POINTS)
def test_polygon_width_I16(points: Coords) -> None:
# Arrange
im = Image.new("I;16", (W, H))
draw = ImageDraw.Draw(im)

# Act
draw.polygon(points, outline=0xFFFF, width=2)

# Assert
assert_image_equal_tofile(im, "Tests/images/imagedraw_polygon_width_I.tiff")


@pytest.mark.parametrize("mode", ("RGB", "L"))
@pytest.mark.parametrize("kite_points", KITE_POINTS)
def test_polygon_kite(
Expand Down
26 changes: 22 additions & 4 deletions src/libImaging/Paste.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,32 @@ paste_mask_1(
int x, y;

if (imOut->image8) {
int in_i16 = strncmp(imIn->mode, "I;16", 4) == 0;
int out_i16 = strncmp(imOut->mode, "I;16", 4) == 0;
for (y = 0; y < ysize; y++) {
UINT8 *out = imOut->image8[y + dy] + dx;
if (out_i16) {
out += dx;
}
UINT8 *in = imIn->image8[y + sy] + sx;
if (in_i16) {
in += sx;
}
UINT8 *mask = imMask->image8[y + sy] + sx;
for (x = 0; x < xsize; x++) {
if (*mask++) {
if (*mask) {
*out = *in;
}
out++, in++;
if (in_i16) {
in++;
}
if (out_i16) {
out++;
if (*mask) {
*out = *in;
}
}
out++, in++, mask++;
}
}

Expand Down Expand Up @@ -415,15 +432,16 @@ fill_mask_L(
unsigned int tmp1;

if (imOut->image8) {
int i16 = strncmp(imOut->mode, "I;16", 4) == 0;
for (y = 0; y < ysize; y++) {
UINT8 *out = imOut->image8[y + dy] + dx;
if (strncmp(imOut->mode, "I;16", 4) == 0) {
if (i16) {
out += dx;
}
UINT8 *mask = imMask->image8[y + sy] + sx;
for (x = 0; x < xsize; x++) {
*out = BLEND(*mask, *out, ink[0], tmp1);
if (strncmp(imOut->mode, "I;16", 4) == 0) {
if (i16) {
out++;
*out = BLEND(*mask, *out, ink[1], tmp1);
}
Expand Down