From c68c508e27935f31ffa357e7e3bc7763cbe461e5 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Wed, 10 May 2023 13:25:35 +1000
Subject: [PATCH] Fixed joined corners for odd dimensions

---
 .../images/imagedraw_rounded_rectangle_x_odd.png  | Bin 0 -> 565 bytes
 .../images/imagedraw_rounded_rectangle_y_odd.png  | Bin 0 -> 527 bytes
 Tests/test_imagedraw.py                           |   2 ++
 src/PIL/ImageDraw.py                              |   4 ++--
 4 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 Tests/images/imagedraw_rounded_rectangle_x_odd.png
 create mode 100644 Tests/images/imagedraw_rounded_rectangle_y_odd.png

diff --git a/Tests/images/imagedraw_rounded_rectangle_x_odd.png b/Tests/images/imagedraw_rounded_rectangle_x_odd.png
new file mode 100644
index 0000000000000000000000000000000000000000..f23f1945e1fec32362830cc6e872c08956fe7758
GIT binary patch
literal 565
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1SJ1AFflVQF#hp$aSW-L^Y)IT-w^`=m%zhE
zAEb56<~2{A$QmXTy>iE{w+sGn_n7?5SDmN3P}2njzRbCo#{c2^^YHh}*S}w5dCT|M
zE9R}USk2jA&%3xWWowR(cyO##q+A$Fa4b`#&^6JO{qORB7e5qTwD-`)Up}=9!fJO|
zY>HUZcg1$uF22YK;R<2iS#wsda}|3i+FGjhG<B7=>gMXbv*XuKnWT5Ms_^&yc>Az@
zA<u>4^o_6StUTA+6Q{U6F?LqSp{H{qj(<0ZTvZx)z3Ao!v58r+w;qX>O8ZUel0MKZ
z`qzKc(vOPHX4$`@a&I0tNU%*>yN%8LYyLH*?5$5_)&3M;tIrb2-hRV-?bT~}OD0-R
zJS)WH&7reUam`oxi0F04#b&FrOcRK3O5kiHi@}@tc3)ZP)6>g>Z}FD>zMYf<F|0Rf
z?f)A^wi~!+t3Ev*m9=xvVTlc47WFTZnisd-Y3tURUdzLOO?g^&&50H4f4)5Jk~q*-
zT615mN>)GjX6^Gd-AAG-p+a`)s@1J==Xy$i$t|mNo$vAZ{+h@*&h+msciMi&SuU3;
zteYmFzL~S|*?fWJo?L}~D+Saaa20ObB(S`UyHL(X5C|?#{>56pvSWg^N}?GsIWTy-
L`njxgN@xNA*hcbx

literal 0
HcmV?d00001

diff --git a/Tests/images/imagedraw_rounded_rectangle_y_odd.png b/Tests/images/imagedraw_rounded_rectangle_y_odd.png
new file mode 100644
index 0000000000000000000000000000000000000000..96441bc7289eb3e70f23df0f9569a72ca407046d
GIT binary patch
literal 527
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1SJ1AFflVQFkbU?aSW-L^Y%_)ShInETjHx@
zZ_e4g^C^Gk9B09D;?HDGgO7FGD^9*`_<Ci74p18yB(z+gYX9c1>66s@eeHX4ax2z2
zHumxGnrmG<+MA`k>ge%ZwwI%FHl2v*Kea_{s*cXIrB|NMkUq8kp?mumu8z`qnE?xw
zpFgyk{PmcXW@+KFt&>x1_wGuPox02L@~uFla{c->cZ2v(ZrL{b%=OoYw>Rl5oz@)s
zv#zi@NmVP<<?E#6rP`q_Uy9<|&X(E){I}W~@iltl(vZOQVN!aEVc&vW{q_H+&e$08
zFm9*mwdDUEe2I7F7H|607y2-Izvi_&$)OS7Ud&wcCOOoiOz?x{>;D<YZ=HEAlN_4!
z?b05hnL3OcS&j&qB>C1H)>?8~Y_h7tw1x<#B+d>5Bjd=enzOk-pU;aiv$pylHUFfL
zfVYE=qxH2T+jU>IZ8eA#@?T@wc6uXs@S4--s_&fG<o-N$M(vK8*V~WHs@~DF`}6$=
zpZTU&KXqDTRevn*>#Vopy=IX&tG`Z(a<WTLeR*}ipXIf8(I5ZBDY~=UOrE+f{E8ws
z(1aD?4+=&2tT-*4)E^WqYe?SD#5aYzBBZgQJ%OWQPgeu`cUb(e)XRr;Wa)~ro&t$@
My85}Sb4q9e0Pv&n6951J

literal 0
HcmV?d00001

diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py
index e8a0403a51b..7497fdc66a8 100644
--- 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
index 1e4eeab2543..7d1790faa93 100644
--- 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