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

Merge pull request #4722 from radarhere/line

Browse Source
This commit is contained in:
Hugo van Kemenade 2020-06-23 14:53:56 +03:00 committed by GitHub
commit 71fadd5c67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tests/images/imagedraw_wide_line_larger_than_int.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 557 B

85
Tests/test_imagedraw.py
View File

@ -5,7 +5,7 @@ from PIL import Image, ImageColor, ImageDraw, ImageFont
from .helper import ( from .helper import (
assert_image_equal, assert_image_equal,
assert_image_similar, assert_image_similar_tofile,
hopper, hopper,
skip_unless_feature, skip_unless_feature,
) )
@ -71,7 +71,7 @@ def helper_arc(bbox, start, end):
draw.arc(bbox, start, end) draw.arc(bbox, start, end)
# Assert # Assert
assert_image_similar(im, Image.open("Tests/images/imagedraw_arc.png"), 1) assert_image_similar_tofile(im, "Tests/images/imagedraw_arc.png", 1)
def test_arc1(): def test_arc1():
@ -110,20 +110,19 @@ def test_arc_no_loops():
draw.arc(BBOX1, start=start, end=end) draw.arc(BBOX1, start=start, end=end)
# Assert # Assert
assert_image_similar(im, Image.open("Tests/images/imagedraw_arc_no_loops.png"), 1) assert_image_similar_tofile(im, "Tests/images/imagedraw_arc_no_loops.png", 1)
def test_arc_width(): def test_arc_width():
# Arrange # Arrange
im = Image.new("RGB", (W, H)) im = Image.new("RGB", (W, H))
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
expected = "Tests/images/imagedraw_arc_width.png"
# Act # Act
draw.arc(BBOX1, 10, 260, width=5) draw.arc(BBOX1, 10, 260, width=5)
# Assert # Assert
assert_image_similar(im, Image.open(expected), 1) assert_image_similar_tofile(im, "Tests/images/imagedraw_arc_width.png", 1)
def test_arc_width_pieslice_large(): def test_arc_width_pieslice_large():
@ -131,26 +130,24 @@ def test_arc_width_pieslice_large():
# Arrange # Arrange
im = Image.new("RGB", (W, H)) im = Image.new("RGB", (W, H))
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
expected = "Tests/images/imagedraw_arc_width_pieslice.png"
# Act # Act
draw.arc(BBOX1, 10, 260, fill="yellow", width=100) draw.arc(BBOX1, 10, 260, fill="yellow", width=100)
# Assert # Assert
assert_image_similar(im, Image.open(expected), 1) assert_image_similar_tofile(im, "Tests/images/imagedraw_arc_width_pieslice.png", 1)
def test_arc_width_fill(): def test_arc_width_fill():
# Arrange # Arrange
im = Image.new("RGB", (W, H)) im = Image.new("RGB", (W, H))
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
expected = "Tests/images/imagedraw_arc_width_fill.png"
# Act # Act
draw.arc(BBOX1, 10, 260, fill="yellow", width=5) draw.arc(BBOX1, 10, 260, fill="yellow", width=5)
# Assert # Assert
assert_image_similar(im, Image.open(expected), 1) assert_image_similar_tofile(im, "Tests/images/imagedraw_arc_width_fill.png", 1)
def test_arc_width_non_whole_angle(): def test_arc_width_non_whole_angle():
@ -163,7 +160,7 @@ def test_arc_width_non_whole_angle():
draw.arc(BBOX1, 10, 259.5, width=5) draw.arc(BBOX1, 10, 259.5, width=5)
# Assert # Assert
assert_image_similar(im, Image.open(expected), 1) assert_image_similar_tofile(im, expected, 1)
def test_bitmap(): def test_bitmap():
@ -190,7 +187,7 @@ def helper_chord(mode, bbox, start, end):
draw.chord(bbox, start, end, fill="red", outline="yellow") draw.chord(bbox, start, end, fill="red", outline="yellow")
# Assert # Assert
assert_image_similar(im, Image.open(expected), 1) assert_image_similar_tofile(im, expected, 1)
def test_chord1(): def test_chord1():
@ -209,26 +206,24 @@ def test_chord_width():
# Arrange # Arrange
im = Image.new("RGB", (W, H)) im = Image.new("RGB", (W, H))
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
expected = "Tests/images/imagedraw_chord_width.png"
# Act # Act
draw.chord(BBOX1, 10, 260, outline="yellow", width=5) draw.chord(BBOX1, 10, 260, outline="yellow", width=5)
# Assert # Assert
assert_image_similar(im, Image.open(expected), 1) assert_image_similar_tofile(im, "Tests/images/imagedraw_chord_width.png", 1)
def test_chord_width_fill(): def test_chord_width_fill():
# Arrange # Arrange
im = Image.new("RGB", (W, H)) im = Image.new("RGB", (W, H))
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
expected = "Tests/images/imagedraw_chord_width_fill.png"
# Act # Act
draw.chord(BBOX1, 10, 260, fill="red", outline="yellow", width=5) draw.chord(BBOX1, 10, 260, fill="red", outline="yellow", width=5)
# Assert # Assert
assert_image_similar(im, Image.open(expected), 1) assert_image_similar_tofile(im, "Tests/images/imagedraw_chord_width_fill.png", 1)
def test_chord_zero_width(): def test_chord_zero_width():
@ -254,7 +249,7 @@ def helper_ellipse(mode, bbox):
draw.ellipse(bbox, fill="green", outline="blue") draw.ellipse(bbox, fill="green", outline="blue")
# Assert # Assert
assert_image_similar(im, Image.open(expected), 1) assert_image_similar_tofile(im, expected, 1)
def test_ellipse1(): def test_ellipse1():
@ -276,8 +271,8 @@ def test_ellipse_translucent():
draw.ellipse(BBOX1, fill=(0, 255, 0, 127)) draw.ellipse(BBOX1, fill=(0, 255, 0, 127))
# Assert # Assert
expected = Image.open("Tests/images/imagedraw_ellipse_translucent.png") expected = "Tests/images/imagedraw_ellipse_translucent.png"
assert_image_similar(im, expected, 1) assert_image_similar_tofile(im, expected, 1)
def test_ellipse_edge(): def test_ellipse_edge():
@ -289,7 +284,7 @@ def test_ellipse_edge():
draw.ellipse(((0, 0), (W - 1, H)), fill="white") draw.ellipse(((0, 0), (W - 1, H)), fill="white")
# Assert # Assert
assert_image_similar(im, Image.open("Tests/images/imagedraw_ellipse_edge.png"), 1) assert_image_similar_tofile(im, "Tests/images/imagedraw_ellipse_edge.png", 1)
def test_ellipse_symmetric(): def test_ellipse_symmetric():
@ -304,39 +299,36 @@ def test_ellipse_width():
# Arrange # Arrange
im = Image.new("RGB", (W, H)) im = Image.new("RGB", (W, H))
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
expected = "Tests/images/imagedraw_ellipse_width.png"
# Act # Act
draw.ellipse(BBOX1, outline="blue", width=5) draw.ellipse(BBOX1, outline="blue", width=5)
# Assert # Assert
assert_image_similar(im, Image.open(expected), 1) assert_image_similar_tofile(im, "Tests/images/imagedraw_ellipse_width.png", 1)
def test_ellipse_width_large(): def test_ellipse_width_large():
# Arrange # Arrange
im = Image.new("RGB", (500, 500)) im = Image.new("RGB", (500, 500))
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
expected = "Tests/images/imagedraw_ellipse_width_large.png"
# Act # Act
draw.ellipse((25, 25, 475, 475), outline="blue", width=75) draw.ellipse((25, 25, 475, 475), outline="blue", width=75)
# Assert # Assert
assert_image_similar(im, Image.open(expected), 1) assert_image_similar_tofile(im, "Tests/images/imagedraw_ellipse_width_large.png", 1)
def test_ellipse_width_fill(): def test_ellipse_width_fill():
# Arrange # Arrange
im = Image.new("RGB", (W, H)) im = Image.new("RGB", (W, H))
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
expected = "Tests/images/imagedraw_ellipse_width_fill.png"
# Act # Act
draw.ellipse(BBOX1, fill="green", outline="blue", width=5) draw.ellipse(BBOX1, fill="green", outline="blue", width=5)
# Assert # Assert
assert_image_similar(im, Image.open(expected), 1) assert_image_similar_tofile(im, "Tests/images/imagedraw_ellipse_width_fill.png", 1)
def test_ellipse_zero_width(): def test_ellipse_zero_width():
@ -423,7 +415,7 @@ def helper_pieslice(bbox, start, end):
draw.pieslice(bbox, start, end, fill="white", outline="blue") draw.pieslice(bbox, start, end, fill="white", outline="blue")
# Assert # Assert
assert_image_similar(im, Image.open("Tests/images/imagedraw_pieslice.png"), 1) assert_image_similar_tofile(im, "Tests/images/imagedraw_pieslice.png", 1)
def test_pieslice1(): def test_pieslice1():
@ -440,13 +432,12 @@ def test_pieslice_width():
# Arrange # Arrange
im = Image.new("RGB", (W, H)) im = Image.new("RGB", (W, H))
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
expected = "Tests/images/imagedraw_pieslice_width.png"
# Act # Act
draw.pieslice(BBOX1, 10, 260, outline="blue", width=5) draw.pieslice(BBOX1, 10, 260, outline="blue", width=5)
# Assert # Assert
assert_image_similar(im, Image.open(expected), 1) assert_image_similar_tofile(im, "Tests/images/imagedraw_pieslice_width.png", 1)
def test_pieslice_width_fill(): def test_pieslice_width_fill():
@ -459,7 +450,7 @@ def test_pieslice_width_fill():
draw.pieslice(BBOX1, 10, 260, fill="white", outline="blue", width=5) draw.pieslice(BBOX1, 10, 260, fill="white", outline="blue", width=5)
# Assert # Assert
assert_image_similar(im, Image.open(expected), 1) assert_image_similar_tofile(im, expected, 1)
def test_pieslice_zero_width(): def test_pieslice_zero_width():
@ -571,13 +562,12 @@ def test_big_rectangle():
im = Image.new("RGB", (W, H)) im = Image.new("RGB", (W, H))
bbox = [(-1, -1), (W + 1, H + 1)] bbox = [(-1, -1), (W + 1, H + 1)]
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
expected = "Tests/images/imagedraw_big_rectangle.png"
# Act # Act
draw.rectangle(bbox, fill="orange") draw.rectangle(bbox, fill="orange")
# Assert # Assert
assert_image_similar(im, Image.open(expected), 1) assert_image_similar_tofile(im, "Tests/images/imagedraw_big_rectangle.png", 1)
def test_rectangle_width(): def test_rectangle_width():
@ -878,13 +868,25 @@ def test_wide_line_dot():
# Arrange # Arrange
im = Image.new("RGB", (W, H)) im = Image.new("RGB", (W, H))
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
expected = "Tests/images/imagedraw_wide_line_dot.png"
# Act # Act
draw.line([(50, 50), (50, 50)], width=3) draw.line([(50, 50), (50, 50)], width=3)
# Assert # Assert
assert_image_similar(im, Image.open(expected), 1) assert_image_similar_tofile(im, "Tests/images/imagedraw_wide_line_dot.png", 1)
def test_wide_line_larger_than_int():
# Arrange
im = Image.new("RGB", (W, H))
draw = ImageDraw.Draw(im)
expected = "Tests/images/imagedraw_wide_line_larger_than_int.png"
# Act
draw.line([(0, 0), (32768, 32768)], width=3)
# Assert
assert_image_similar_tofile(im, expected, 1)
@pytest.mark.parametrize( @pytest.mark.parametrize(
@ -971,13 +973,12 @@ def test_wide_line_dot():
def test_line_joint(xy): def test_line_joint(xy):
im = Image.new("RGB", (500, 325)) im = Image.new("RGB", (500, 325))
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
expected = "Tests/images/imagedraw_line_joint_curve.png"
# Act # Act
draw.line(xy, GRAY, 50, "curve") draw.line(xy, GRAY, 50, "curve")
# Assert # Assert
assert_image_similar(im, Image.open(expected), 3) assert_image_similar_tofile(im, "Tests/images/imagedraw_line_joint_curve.png", 3)
def test_textsize_empty_string(): def test_textsize_empty_string():
@ -1018,8 +1019,8 @@ def test_stroke():
draw.text((10, 10), "A", "#f00", font, stroke_width=2, stroke_fill=stroke_fill) draw.text((10, 10), "A", "#f00", font, stroke_width=2, stroke_fill=stroke_fill)
# Assert # Assert
assert_image_similar( assert_image_similar_tofile(
im, Image.open("Tests/images/imagedraw_stroke_" + suffix + ".png"), 3.1 im, "Tests/images/imagedraw_stroke_" + suffix + ".png", 3.1
) )
@ -1034,9 +1035,7 @@ def test_stroke_descender():
draw.text((10, 0), "y", "#f00", font, stroke_width=2, stroke_fill="#0f0") draw.text((10, 0), "y", "#f00", font, stroke_width=2, stroke_fill="#0f0")
# Assert # Assert
assert_image_similar( assert_image_similar_tofile(im, "Tests/images/imagedraw_stroke_descender.png", 6.76)
im, Image.open("Tests/images/imagedraw_stroke_descender.png"), 6.76
)
@skip_unless_feature("freetype2") @skip_unless_feature("freetype2")
@ -1052,9 +1051,7 @@ def test_stroke_multiline():
) )
# Assert # Assert
assert_image_similar( assert_image_similar_tofile(im, "Tests/images/imagedraw_stroke_multiline.png", 3.3)
im, Image.open("Tests/images/imagedraw_stroke_multiline.png"), 3.3
)
def test_same_color_outline(): def test_same_color_outline():
@ -1093,4 +1090,4 @@ def test_same_color_outline():
expected = "Tests/images/imagedraw_outline_{}_{}.png".format( expected = "Tests/images/imagedraw_outline_{}_{}.png".format(
operation, mode operation, mode
) )
assert_image_similar(im, Image.open(expected), 1) assert_image_similar_tofile(im, expected, 1)

2
src/libImaging/Draw.c
View File

@ -683,7 +683,7 @@ ImagingDrawWideLine(Imaging im, int x0, int y0, int x1, int y1,
return 0; return 0;
} }
big_hypotenuse = sqrt((double) (dx*dx + dy*dy)); big_hypotenuse = hypot(dx, dy);
small_hypotenuse = (width - 1) / 2.0; small_hypotenuse = (width - 1) / 2.0;
ratio_max = ROUND_UP(small_hypotenuse) / big_hypotenuse; ratio_max = ROUND_UP(small_hypotenuse) / big_hypotenuse;
ratio_min = ROUND_DOWN(small_hypotenuse) / big_hypotenuse; ratio_min = ROUND_DOWN(small_hypotenuse) / big_hypotenuse;