Skip to content
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

Jump to bottom

Consider I;16 pixel size when drawing #3899

Merged
merged 1 commit into from Jun 30, 2019
Merged

Consider I;16 pixel size when drawing #3899

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file added Tests/images/imagedraw_rectangle_I.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions Tests/test_imagedraw.py
View file
Open in desktop
Expand Up @@ -479,6 +479,19 @@ def test_rectangle_width_fill(self):
# Assert
self.assert_image_equal(im, Image.open(expected))

def test_rectangle_I16(self):
# Arrange
im = Image.new("I;16", (W, H))
draw = ImageDraw.Draw(im)

# Act
draw.rectangle(BBOX1, fill="black", outline="green")

# Assert
self.assert_image_equal(
im.convert("I"), Image.open("Tests/images/imagedraw_rectangle_I.png")
)

def test_floodfill(self):
red = ImageColor.getrgb("red")

Expand Down
16 changes: 12 additions & 4 deletions src/libImaging/Draw.c
View file
Open in desktop
Expand Up @@ -68,7 +68,12 @@ static inline void
point8(Imaging im, int x, int y, int ink)
{
if (x >= 0 && x < im->xsize && y >= 0 && y < im->ysize)
im->image8[y][x] = (UINT8) ink;
if (strncmp(im->mode, "I;16", 4) == 0) {
im->image8[y][x*2] = (UINT8) ink;
im->image8[y][x*2+1] = (UINT8) ink;
} else {
im->image8[y][x] = (UINT8) ink;
}
}

static inline void
Expand All @@ -95,7 +100,7 @@ point32rgba(Imaging im, int x, int y, int ink)
static inline void
hline8(Imaging im, int x0, int y0, int x1, int ink)
{
int tmp;
int tmp, pixelwidth;

if (y0 >= 0 && y0 < im->ysize) {
if (x0 > x1)
Expand All @@ -108,8 +113,11 @@ hline8(Imaging im, int x0, int y0, int x1, int ink)
return;
else if (x1 >= im->xsize)
x1 = im->xsize-1;
if (x0 <= x1)
memset(im->image8[y0] + x0, (UINT8) ink, x1 - x0 + 1);
if (x0 <= x1) {
pixelwidth = strncmp(im->mode, "I;16", 4) == 0 ? 2 : 1;
memset(im->image8[y0] + x0 * pixelwidth, (UINT8) ink,
(x1 - x0 + 1) * pixelwidth);
}
}
}

Expand Down