python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-13 18:56:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix CI

Browse Source
This commit is contained in:
Stanislau Tsitsianok 2020-06-29 23:58:58 +03:00
parent 7dedb1402f
commit 88651c334f
No known key found for this signature in database
GPG Key ID: 349CB26B2ED6E0C0
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tests/test_imagedraw.py
View File

@ -165,7 +165,7 @@ def test_arc_width_non_whole_angle():
def test_arc_high(): def test_arc_high():
# Arrange # Arrange
im = Image.new("RGB", (200, 200)); im = Image.new("RGB", (200, 200))
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
# Act # Act
@ -252,7 +252,7 @@ def test_chord_zero_width():
def test_chord_too_fat(): def test_chord_too_fat():
# Arrange # Arrange
im = Image.new("RGB", (100, 100)); im = Image.new("RGB", (100, 100))
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
# Act # Act
@ -401,7 +401,9 @@ def test_ellipse_various_sizes():
def test_ellipse_various_sizes_filled(): def test_ellipse_various_sizes_filled():
im = ellipse_various_sizes_helper(True) im = ellipse_various_sizes_helper(True)
with Image.open("Tests/images/imagedraw_ellipse_various_sizes_filled.png") as expected: with Image.open(
"Tests/images/imagedraw_ellipse_various_sizes_filled.png"
) as expected:
assert_image_equal(im, expected) assert_image_equal(im, expected)
@ -529,7 +531,7 @@ def test_pieslice_zero_width():
def test_pieslice_wide(): def test_pieslice_wide():
# Arrange # Arrange
im = Image.new("RGB", (200, 100)); im = Image.new("RGB", (200, 100))
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
# Act # Act

6
src/libImaging/Draw.c
View File

@ -1050,10 +1050,10 @@ int clip_tree_do_clip(clip_node* root, int32_t x0, int32_t y, int32_t x1, event_
// X of intersection // X of intersection
double ix = - (B * y + C) / A; double ix = - (B * y + C) / A;
if (A * x0 + B * y + C < eps) { if (A * x0 + B * y + C < eps) {
x0 = round(fmax(x0, ix)); x0 = lround(fmax(x0, ix));
} }
if (A * x1 + B * y + C < eps) { if (A * x1 + B * y + C < eps) {
x1 = round(fmin(x1, ix)); x1 = lround(fmin(x1, ix));
} }
} }
if (x0 <= x1) { if (x0 <= x1) {
@ -1557,7 +1557,7 @@ ImagingDrawPieslice(Imaging im, int x0, int y0, int x1, int y1,
if (pieSideNew(im, x0, y0, x1, y1, end, ink, width, op)) { if (pieSideNew(im, x0, y0, x1, y1, end, ink, width, op)) {
return -1; return -1;
} }
float xc = round((x0 + x1 - width) / 2.0), yc = round((y0 + y1 - width) / 2.0); int xc = lround((x0 + x1 - width) / 2.0), yc = lround((y0 + y1 - width) / 2.0);
ellipseNew(im, xc, yc, xc + width - 1, yc + width - 1, ink, 1, 0, op); ellipseNew(im, xc, yc, xc + width - 1, yc + width - 1, ink, 1, 0, op);
return pieNew(im, x0, y0, x1, y1, start, end, ink, width, op); return pieNew(im, x0, y0, x1, y1, start, end, ink, width, op);
} }