Merge pull request python-pillow#6278 from radarhere/polygon

Fixed drawing translucent 1px high polygons
nguyenkhangme · Jun 4, 2022 · 38931c1 · 38931c1
2 parents b43cfce + c824ab0
commit 38931c1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/Tests/images/imagedraw_polygon_1px_high_translucent.png b/Tests/images/imagedraw_polygon_1px_high_translucent.png
diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py
@@ -655,6 +655,20 @@ def test_polygon_1px_high():
     assert_image_equal_tofile(im, expected)
 
 
+def test_polygon_1px_high_translucent():
+    # Test drawing a translucent 1px high polygon
+    # Arrange
+    im = Image.new("RGB", (4, 3))
+    draw = ImageDraw.Draw(im, "RGBA")
+    expected = "Tests/images/imagedraw_polygon_1px_high_translucent.png"
+
+    # Act
+    draw.polygon([(1, 1), (1, 1), (3, 1), (3, 1)], (255, 0, 0, 127))
+
+    # Assert
+    assert_image_equal_tofile(im, expected)
+
+
 def test_polygon_translucent():
     # Arrange
     im = Image.new("RGB", (W, H))

diff --git a/src/libImaging/Draw.c b/src/libImaging/Draw.c
@@ -419,7 +419,7 @@ draw_horizontal_lines(
         if (e[i].ymin == y && e[i].ymin == e[i].ymax) {
             int xmax;
             int xmin = e[i].xmin;
-            if (*x_pos < xmin) {
+            if (*x_pos != -1 && *x_pos < xmin) {
                 // Line would be after the current position
                 continue;
             }
@@ -542,7 +542,7 @@ polygon_generic(Imaging im, int n, Edge *e, int ink, int eofill, hline_handler h
         }
         qsort(xx, j, sizeof(float), x_cmp);
         if (hasAlpha == 1) {
-            int x_pos = 0;
+            int x_pos = j == 0 ? -1 : 0;
             for (i = 1; i < j; i += 2) {
                 int x_end = ROUND_DOWN(xx[i]);
                 if (x_end < x_pos) {