Merge pull request #7151 from radarhere/rounded_rectangle

python-pillow · May 12, 2023 · c561cd2 · c561cd2
2 parents 0efd72d + c68c508
commit c561cd2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/Tests/images/imagedraw_rounded_rectangle_x_odd.png b/Tests/images/imagedraw_rounded_rectangle_x_odd.png
diff --git a/Tests/images/imagedraw_rounded_rectangle_y_odd.png b/Tests/images/imagedraw_rounded_rectangle_y_odd.png
diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py
@@ -839,7 +839,9 @@ def test_rounded_rectangle_zero_radius(bbox):
     "xy, suffix",
     [
         ((20, 10, 80, 90), "x"),
+        ((20, 10, 81, 90), "x_odd"),
         ((10, 20, 90, 80), "y"),
+        ((10, 20, 90, 81), "y_odd"),
         ((20, 20, 80, 80), "both"),
     ],
 )

diff --git a/src/PIL/ImageDraw.py b/src/PIL/ImageDraw.py
@@ -314,11 +314,11 @@ def rounded_rectangle(
 
         full_x, full_y = False, False
         if all(corners):
-            full_x = d >= x1 - x0
+            full_x = d >= x1 - x0 - 1
             if full_x:
                 # The two left and two right corners are joined
                 d = x1 - x0
-            full_y = d >= y1 - y0
+            full_y = d >= y1 - y0 - 1
             if full_y:
                 # The two top and two bottom corners are joined
                 d = y1 - y0