From 521c43173490ffab7b2011b3e93bc7ba1f20e847 Mon Sep 17 00:00:00 2001
From: Stanislau Tsitsianok <tsmx@tut.by>
Date: Fri, 3 Apr 2020 22:33:47 +0300
Subject: [PATCH] fixed failing tests

---
 Tests/images/imagedraw_ellipse_L.png          | Bin 359 -> 318 bytes
 Tests/images/imagedraw_ellipse_RGB.png        | Bin 466 -> 408 bytes
 Tests/images/imagedraw_ellipse_edge.png       | Bin 602 -> 622 bytes
 Tests/images/imagedraw_ellipse_width.png      | Bin 452 -> 439 bytes
 Tests/images/imagedraw_ellipse_width_fill.png | Bin 477 -> 465 bytes
 .../images/imagedraw_ellipse_width_large.png  | Bin 4455 -> 4451 bytes
 Tests/images/imagedraw_ellipse_zero_width.png | Bin 339 -> 333 bytes
 Tests/test_imagedraw.py                       |   4 +-
 Tests/test_imagedraw2.py                      |   2 +-
 src/libImaging/Draw.c                         | 108 +++++++++---------
 10 files changed, 56 insertions(+), 58 deletions(-)

diff --git a/Tests/images/imagedraw_ellipse_L.png b/Tests/images/imagedraw_ellipse_L.png
index e47e6e441c16afcc1edb2f7c2a715fd36469c096..d5959cc0820251a9d76a3f3fe0a6ed60fd8dd2ad 100644
GIT binary patch
delta 291
zcmV+;0o?xQ0=@!}B!2}-L_t(|obA}%4Z<)G17L$#BP(?OIkG|*;Q=9vM9x0-=TK`u
zRY3XVqz}CSj^j9v<2cS~a?Aa^y)Wj>U5^|vEkBSUxk>v50HCXki2NWDjD!pbnNg57
zBmkgu<-XRy)WWYdgcyoK5o!nuLj;2>1d$A?#E57xMR>Z_Cx1lbBBV-rlSGlYN_CS|
zk+4d2lhYu{Er~Ye3d?20$bQJ&lYcdS%e%sI9fKq{C3x|!Zj!4KO%UZxGF8G+sJ@9_
zC7$U>6Hy^^BU>&>VY4aS6G5T#FW-2o@EKcpx`-mo@qcq7F=n<rTNyB0pAx;8#d%l9
p9_L*j2*?1A;~Y4S<2cT7c>>~7JB_M}qYeN7002ovPDHLkV1ljyfiM67

delta 332
zcmV-S0ki(T0_OsdB!4bRL_t(|ob8y=4TC@oL*4FiE3p3@tiU4uXc2sHwj+8Vwe}a4
z3=by})dh&6D2k#eihf3qlDln}%NR%lFs(o43de=C9bgCYI3DB(QNUP`c8qvq49fEy
z1JiyOdeTW40)P`nCXoyyjDl!}L6J!`Lwf|IISgRpQ8>hy9Dm0tl6XN>TPVaVmV6rq
z@rxzgG>IRCd!5h9X%R@FBLE%ayOUf2sm&I>gCwc7g!%uWCxHYq5Hc4Z)%W)ym9v4k
z<L+`@0$FNJnfvv<J4tQ6n3q9n^F`deTz(Ylq>#m?@PiOf;unlM#dMitOvcxMcx_Q0
z1##LUPo^@7rbXz}ud^(mhf`-;;CxnC7;7V8E^s<wzPVe$C0nAEGkD*%aXza5J4aCz
eMNt$*qxAwaiaK1>^KiES0000<MNUMnLSTYu-IAvO

diff --git a/Tests/images/imagedraw_ellipse_RGB.png b/Tests/images/imagedraw_ellipse_RGB.png
index b52b128023c1c7126d5bdf76e82a8b682a0a176a..1d310ce115a05e81b8da4947055b4333c72846e8 100644
GIT binary patch
delta 381
zcmcb_JcD_HN`1Vii(^Q|oVT|P^9~ybxCC0MUq3rFDcGR3r)Q(FH_QL6dS`0ZtW;XP
zl>q_jzs<5c@UHIPi;m(x`6TWVTlr_Vto!Cx8eH3Z?Y4t|-67sNH7eJZ&ny!@d1#}R
z(c4WYCvALp&S&@QbAJ@$8{bD{OM0)Bx@zu!$!unQ#JM2VOWFdb<5&Ht-kH4AOSD)&
zdri*DM{k~Xn+C4BQFU})+y6$*Yj+|<&lea*GP$pLxlya_VbUg+w;Rt%tiEI$<1?)x
zf+>l!DtT^6;?!%|-6w?vyd88HH?kaoG4^hZ+iz~ccj4Fna5ae3+l_v^w(Syko1s(I
zsC-TGaOw?bpoz;OE+2jxnV-CgWnV<`;ndr+w)kCh(SKgI@^|`-x2gAz@ZO1B8TW7Q
z(=)8^-;3US*JsN+cW+Sjhdqgk5AMn`=C^Vl3m2}q|G|0r{*zpYz`8Hc8X5CtYjhY$
N$kWx&Wt~$(69C3+umu1B

delta 440
zcmbQie2IC2O8rbv7srr_Id5-Y>^o$@;}SSs|NZ=Oc`j9jjcX1X`)&PhqnyO1&a2eP
zfB=7PUWz@CSpB`}U(juB38ScZ@y&gK+pgX*{qXkif1wN7-yhsL`up%NrDcKcDbF@+
z>sX&G6{~Dq+tr;uqhp2ttABa<@_eQ?_d6AqsZXmHGcK8Cx6)wi3@aV)AnV$=U*|rl
zq)K{AT}$)L+OD_j*`?OhDkn?#@Um(9*UBARd)`|l>^O@|rdxQ+Rcl7~qf;}iR&QUM
zVro(UZcbcf#NE|bS5!$mrmG5sIps!twqbWq4Gk^7X2X4L-4?lJiA;$=2^6A!O1_u+
z?IY8#1xsH`x&3|hrd2cAI9sL$$XzqKxM^$NR&D0FQx$$4PHK84bY%fY_Pq3@Le))~
zH*Uwwy6BpyD_C23l5g8fu^;zNR?OP}o?rHM$E&x8P87^IJ7ao<PHDukqu%vw*EeWx
zeUfUq_DxKiX?tPsceXk9<t)0-_9kBZ)Ue(#V`F_m`SSy7H~1Ia{~)Zs<0Ka%pzZsP
VhsUIP>7D@zdAj<!taD0e0subT#l-*s

diff --git a/Tests/images/imagedraw_ellipse_edge.png b/Tests/images/imagedraw_ellipse_edge.png
index 25a95a6018a1b08145e9e84ce6dce47b4f09d403..a2235115af388ef3e461aa212ef9be0acffa3935 100644
GIT binary patch
delta 597
zcmcb`@{VPKO1-J4i(^Q|oVRmNPis~XVLAB!|MN3Vmd6BGrPj5%U$tU?xk)ii@Z-Dd
zd*ap~@~?WIKi9L4>3saAJASjC-?c5V)piWGQGWL=`_9^zC+?nlC-v9U{r;Vlvvn8l
zXIUk!J5#iy&P3KQWLqTfmF1f0R));4?`CyntdGdv>}L2>XW1>4`fP>Z#$%k}X2ll1
zf~DS@mPIa}U9?p&B~o|>R|w0+6yId61;+$aeABcPTD7K{E?wzRxkV{bcs7>^+nLj|
z?u9H+S#~r3u;_^sQA@%ab8bvov($(6(nS4K-3+Y>9Ove#7U*T)jAC8)X#R<)J0TB3
zm`(>MOmkgZwlDO8P9uNh6|H(DA*anO6I4G;J1S-KbVX|#=bzJy!Z^z;O}rT*nNA4Z
zkdY2!bQC-*<S>n46HwiQn|Dty1W7>o4LXb|oC*-NP@xTf|C|+C{9x~LxH7Zr2X8n3
zQrB1n5jn75XWLqq-7>R)w${7u^s~$YoA_hGQLmnk7NEl-#Gc;z8Roc|#V;jLuUzrr
zp2+UsySmOBiR_rNHD{;L!Qit|7s9QI(j@hsYD-VE^;Xc&o>(;Xh)&kEFZ;Ndr|BK;
ztexsE{B4b9t>?lmymdzLSu#Iw7f8j6I%dhqs(lC*U#R)5<G)7s&da`j{7Vmqt|>gU
z*8c<Z&#d{YBCpJwzT~Q`>F?Ydxkq`_k14vIYS?!8ZNZ;VUYRv&hbPufEs#jDWtKJm
Z#V)P6Zr7Hy+NBIY;OXk;vd$@?2>|5e4hR4M

delta 577
zcmaFIa*JhxO1+||i(^Q|oVRlwC$%UDupIpV|EBE*!_$kDSbLc#RhBaCzMOSza>e)1
zZ?*dWH-6t2uj<NbQ)7S9Z{G8}wk7t??(TA%uYEU*m6d&&yY~7k{_L)o%g@x^)z9jB
zx$sQUQAd-bH?(fA5tF(wW%IgI4u59M67o^HHfxQhkL6;k*R|&t)oU(PO`3Xg)|DyQ
ztM|BF+p~=6>euX<b7F&=tR|(c=hF^Y^(}Q~m*#o#lR_GkzCMbuT)MkD^1Yd;#+#3B
z*SMB3sm^_tvNl<(;P(5aYp(jRev18^uTh|veKvyCXzyg5M&U^9<5~r&4Jn*UHg$wP
zxWar==!bfD#8H{toSE4ZEE0L@StqD|(C(Jpqh#j1iDiQ72FtV$ef{#2R2y^{Q#f;S
zB2-ztRlFG@nNA2fOk)74081zUg_geg-M1!a&v#52pyC_*{+Z6v<e26G(X?SFqunD@
z3we96S^GE5IHH|o3}V+a)dM-oos)Hoa|`>-B%B*V#2#|ZsZxk!Qs2aJeJbN5RiJmC
z7Nl0GM>0*{bd4u`-|Lu7VV_HHzdtLn?(ym+mw(%4v&OgDisgQI|LrKd(C!27v8*1`
z9L}bFX{x#U_K@kxS+)DuuiIb5^Ze`8pvvs?!o4ZKne*;GNbj8CIXBH}EuXaE;p3U#
zUKykv$yxo#MLpH`vncZ%QMJRGC8h=Y5_yB?&-uxGs&eVpPMveE3_#%N>gTe~DWM4f
D32FtN

diff --git a/Tests/images/imagedraw_ellipse_width.png b/Tests/images/imagedraw_ellipse_width.png
index ec0ca6731f69b8728a41a59ae2cd8ebaa0cb71c5..54cfc291ca247de31cc3033575b4993e7f704e11 100644
GIT binary patch
delta 413
zcmV;O0b>5d1GfW^B!7NML_t(|obB7ea)Lk*gyD_v|IX%+3lbJ>obFkz|GQe*8M;Ow
zvWx)$00000000000C?F?cLQ7Z`A19i+1|uSKr?MUH->c~rmcp~Tf%xXrmblI;jjv0
z+6o;-GOVXboiy{#-<FAmRduE7ykcg;njPWg>g5Z*BoNl&fq#|M^{ssD=39D<VLqP2
zbxhZgX}v1{`!<ye74l71EUCklE%W968h#a1Sjn-PtzSP}naRrBpxCQ8!ZKcuM8%y1
zCM)?LmA6)TSnG_{pUQsRla>Do=!5UzzY1XqYQx%{Ai93D-qkHTZ82E_!V(acfUpFF
zB_J#TVF?IJP=6bi>uylwx;JLB1cW7Md2aZr70bhF-yOG8*-zkWm>e!|Ek{`E3|Da{
znG<|wxa?I-VTGQjpRQj&;M_V0d|@SrE3{j{eKL0MH;e9PYk6*1HDc+Vf9xq0uv=Nc
zK6n9dSgcp(5%2EEcq>fC`-T^-{w6B`000000000002cfLlP)$?u6pK600000NkvXX
Hu0mjfwqC&g

delta 426
zcmdnae1v&|N`1Gdi(^Q|oVT}cuREk5(3<$=@BK*qSrWn;Z?8mVulTwDwXDQ6nKJEd
zYz%N<@is8_!132F_+NSJu76;#I4<&RsBHX+70>nV$%lFQ+^=!2xK)+4mUEKOR?BB|
zBKPM!^v?M|Z^JWZ-m4RCgv?M}bMk}U_jMVcXIQP-TOYXei*|0!fjtNFH?cjoJGC^C
z*Z$`nLB8nVx&6B~@Ob*(n)2jnOxv!|<Wt@vVeu=f>I>h*cWwCN`S$B1o1I>Mhj$yb
zJhgeSwRUOy)9N+0>YL@hp82$&N$A^&d7=}fuVrNyOb(k`k`}sm^S{;XFLx`gVK~I4
zfJD?Y{I{-XuHMtEzkjmvlrYiL1`e{*>Q%X_efYDtPMs0ipD1aiK7E`1w>1o|5uesC
zDLb*hY4cf~(zw3!&LY#k?rVD+*P54h^V6og4w@D0^Jh=jUl~>+mG<=Mzy9ggOBwHk
z@jZ~MY4{oFx8?K<x4=(#W=qe^=lG+Q^YEY5pL-v=RF$_Cz{8bcMm4j;5A#s7v?(qi
NK~Gmdmvv4FO#m<=$#Vbz

diff --git a/Tests/images/imagedraw_ellipse_width_fill.png b/Tests/images/imagedraw_ellipse_width_fill.png
index 9b7be602916cce5f30f0e305add360c4939b3955..4a1edc3797fc960b51e11b99f02ab38660e4c014 100644
GIT binary patch
delta 439
zcmV;o0Z9Jc1JMJJB!8GmL_t(|obB7oR>U9>gkki_=goEDCL}PiVpqZO{NGlErtDnK
z473IS00000000000Qj|!)dd`V&408-oy&`O6VS}Eniq!kAf}@Ql`jeFk1-uZ>ko%j
z7}HT`70Iyfl6uXHdEKU*SV%0a`D))}H2CF}Ps~hMlNCxab$@?2i_E*6Kv<)NJ&vgx
zWEh!oMW4Q*TWiLorsJ5NA+4D^>r!`BOy^;*0a+&Ubyg~=@yM3`a$ko3iYcsMTTREW
zZ>~sZxsyuG;t0$5JQ5XG;_s|XTSew74{M*c`cYYrxwDdO<)4vP2LWLTYQySp5cz9x
zJa5@;i_Q`dmVbb-1cW6ZECFE&2una%g4(e9x54{wMm^5+mc1L(SpvcmxIdzaUy05c
z%fni}JMN^ip1{Y-!R9j0<p^t^<|?iv^Ho@+x%{)3!n*uR-7AS~ci`1Q;0r6*T&Z0&
z?whf5e^yKHXLDbMqq?hFEWY!PJ*5J6D+|~MFW`j5elXMYIJ+a`RG5tOh7aw2k`({|
h0000000000z5(aCO;jsHmoWeU002ovPDHLkV1mru(n|mU

delta 451
zcmcb}e3yBGO8pW~7srr_Id5;D&O2<t;}W<nex7~4IBOSM)eRF1XVD$$b3GnKOnU3k
z$$$WNzFo9!h>s7Ke<7dsn?ui7YHRP#)sNXFd+#)VZx0o^9KTP<F4xwzML{!gcJaBH
zrJ+}|ZD(8;yuDw2P43FsJ!<mzmM_yiE^uwvo{)N<{P;UAYHK`XuPs`2+;FeyrY@h*
zDV5Fr9gCK5-QMXdb?wcm>tPo8zNPh7T9^7~U0<f6|JdltTB-23MH|{0SA7>h{ckD9
z>3LT+O@DOqYN7d`?Ozft^FKV=ck1w`z1QvqTgrVrv&r7vt2*Vp*9zX(TTFi}&Ivg+
z^J#qZqq@j8&X)SA4iTI!NQ6SIMsC%D>0hIz!+y`4vvO15MjqiS_7`u2FWPkc(+0oj
z&Z&<L|E$TG6Z2@_jm<(LiM+=5jd!Z;6?xCOZsyW+r;BV|63^<bTsN=s^w;fDch3|(
zed?uk<aEIN>4qyatj>f@nf|wPy75xZIbnVeWNMmz+JyRTIXz=lM&<jpy=TIi{&QLH
m*w6Uiyyj7dt_&i;zwKkZ<`59NwC$!RNYK;O&t;ucLK6Vra@TtR

diff --git a/Tests/images/imagedraw_ellipse_width_large.png b/Tests/images/imagedraw_ellipse_width_large.png
index 9d3c3326b71081b47f545161498e095748a43114..e95186019804a1ba59de4abf7071c87ba8abea4b 100644
GIT binary patch
literal 4451
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
QQ&e%#H8X>XtImJ?8*YWK$^ZZW

literal 4455
zcmbtYc{r4P_a_xGOemSLuY;^J3fVJc>?vCdm9-~fkjXOHvhOC@NrV==YLF$%%xES{
zv|x}%cDMA<lnL)lz3=<<*YEw~cVE|iUH5f=mvheNobNfG^G&j|ImOEj<z{1J<3*Vx
z?b+DaH&`#%9_Alpv-u<&8^0<FX?*r((dy*+kckh6_u9!G{kt^q>&x^4l{1HosKn3}
zeKxhMYNZP?jaX6Us{i>Y)9WS;*;2nwqa*LQW|kbpb$88(n_{@EjgsU)rk7UPA*E7Q
zvcr1o>@^*6I*xxGTQEF*!Z8!!g;?-ckZd9eA%r);3NkYNf*fNTQq9@yy@`dOt+UWq
z3CIMn@P<lr4o`0!4iu(PKvqNE)&hlbpQG?xd0FZkX1_$4u88*bYG->er#&0Bi&*Zf
z4#5Zv<s18-e61V!R-|$9`eL|@YRFNqVw2^<fc!%B<%n`dUrSdUB-o~rW8Zc-9o!{*
zxA^ah2a=eTutPZ+klQCNkS!=DO!DHmFZ4kvCwd?WRJ|azu0}-ch0k+yMFm?8Q90)Q
zo|eRWO<8^BJ?{Azly$>Vm!Lq8i^Acuy!3@4>Y4f#qzrDjWqW_s$-UktF@cx6;mfjD
zP~B+M9_ELq?VfdtK9p?Z`bH#C_qu4ZF(ls8@V(@oCL7e8Cv0uU)vNexDn-1c#ouFW
z(P)4kaAxu(^(tvx`SWZ?iDwn8-|ZD%O@2C9es@`zo+B&Le2Jgdk!sZwtNP^Q(e!;t
zh-;&vpiax6*VqhfTq8?&UN43R2D!gpM1?i11eA27&d2K%<#iL4->BOF?k*vClh}9-
zfTLfIT6N0(`$5gy+T8)~7KLDRhO#c@p38G#df_a1Zn$m`Lf4fAdyO=LA@q!X(I;is
zO26dvaUyx2)jJ*0ZgKM*yL@D|tqboaeZD@Iuf&r&h*L^5613F-VEux<Wf`3az}s8^
zS)S9W4s>QqC8D&ZHGnk~7+G0n2nYO0yuDRbbr5=~Imn}|MopNW>#;9zcx)||QChJV
z{)QT<4os6cXCHJ%B7i|zj>eHsox*fAIQy}MuV`WVE^dD{vOJA}Cb6F#ZGTT_58rdI
z_T8$V0Z>z?uQ~LbR!nSPb4ai$INrXxi~6t;mU~>C^69i~Tg^3kOa{$vvgo9z!)-YC
z;j+cB_Hml_C_Do>bLf$>K-^NTncAi{pImB<6|_&e5w5}LiwxOi3wC_!HSL;P;~o2G
zH4H_J@yTiR77#|J?0t4Ki-=xu0Aas=i&rqSGfduen?Z{%HQVB%CZ&qn4uQSbb1|X`
zUsr~toO%u{h2_Ma`|(taSf)<Su^sglXmcLx-MS8mSD48B+%bhZI;iqg_n|n?X!=kH
z{DskL(EA7nBHE`fBCba;O?}W&ogz*SaCiy5J@3Ms>!9+8k79RBWigQsdi&|(>ZT}B
zYO6d4gyOw#;P|lmJ!9}hFZPK&T8;P?@_00CR0OlXQEa`%?1iH;<bmId^M`rNIJ*rk
zvc4P%g%HtPbjcj);Y=aW>9T#d4ri+!-ZMExlP<Wqq!*MsSEw8=S375Y_*;b;m(qnK
z>|Y*Hxo2tV)VHMV5ecGHht?tdR#BOZge5g=CBw7gn|sn3vT5xmQ9#XV32pncW36&^
z68}kp+={q$zVa~d8l}_Vo#hm+Ey~q%EHv}>WBXd`DfGMmb}nCUG<O49^&-nJdqbcp
zUa2_uiG>aDR4zq^j52qD5GP$|vhANiIy#DDUn@lD9&2j`P;%&-K>NyVlon7__V|Jv
z;_Ynf{d~W|!r9h)dn-IUUk$@ybc;Zb^bZx)iAWk?v|eHZPgZWvbx#pU)Ajd}aYvmE
zb0O#xYXSxJJ@&VR$-I<)AWYx8Ml*nt^xkZmZCtd_0DdCrdDeu+<jBwWr^U6BB4-rL
z1l^J+dOyN2p<#-CCDoQouE}kuUlNNA7lqqMuJTz#eLw{*v3f=Az|S*750dqOh;k>S
zWP*+`U0E|(yFw$no+iG5<Li=;1{^-1=ksF)hDjd58btk1*8?O}q~-e~g#4afN!NAT
zNFdE3YNKf4z<zwj+`-a2x00S-WG5DL7EAHCq$!N!iLINf<tnq%4d7@Y<#Bw_!U3KB
z>&j&W{UK}cN14+h$^-aQp{GKEeoCn=V!0Z;(1c<WEs||~ITsv|@(XUey6>3zSN_W*
zF{!#+Msi<Yl%g|?1glRy(n?VW7>1o}sn0^kq*KF#__WW;P3S`C?G>ftvJr)=G$0>j
z_jUj~VE`2Cj1EN?tu<h%ViVEh&uWTr4ApeRhSaKvuPA+h7~)b@IFLWxbi)Q%zG0(N
zjM}j$h~1N<b>#K%6!-6*Xd|@$&4IaB$eS`h+mY?g<MUFQIet%tHuZOYDhH3=#!C0n
zWKf`6xp%<~45~4?g<cEw<#cYnWdrbNS9FzbT&eA&0U!8+pZReVQ@w-qqDy^<NCH-A
zERG)RAw=V|8+wIa`_?s?wRd3Q-5pcQg;_qkOmu0*#O1xfQ0{uFu8}dB&_2O|i7I{a
z!30K!L=bL2ZuU}VuFOPB46yGtDA$##fndN?_7ZD1Qy9HLRR1F%FO-1iIOIWP=RT(n
zV8!ta<N^BT;xP4ka3H4w37_$19?#x%b%d>n*glAWL_L;Qt-vuQ5wKjP(wCKsTglAT
znm4G0dI6Z;C`f_kwRbirT7GW`2iW$#7NN^C1^N{<-n9X=j{O+md^W_)%a|ypql}Dk
zg!X<8Oey5@GkFz}&U_o@0%oQ@reoI?()#VdFU46({IQ)dov(8iSPpl7XhPesR`p92
zmKRtyvZhAf>%r(AOq;ss&a?<>0EpcJ3tWoNVl4gwi#5aT^LeokrVLeemau>8@yn6_
z+2Xe}s4lQ`84{%%UsH`^$nC_4t~`kK{y*lkjQxKO(=B(}7@Sda!C#&<(01y|BB4fF
zJ&vROf7<sC6#o^rtrTg@7c$(z!$Oo5ax*lbG?)E5g|z+Khml>+Pt=$EhU8B*5rp<0
zf0HdgPRFGo{7dpb5d9&9o^j**mbmoLQ(IvsR`O}#32rwGMHMb}{Npedh74<K14Osb
z)@Dm6ZEChbx6As>yElI*?z4o~3S9woCGyHpO<t@24xvQ(Qy^!vD&SY3h|}dWCfN<t
z(Ne|KQ|pQXX2X^2EQ@#u?SnW7kr!WQn=$8C{$Gz9IF{PpQIFlv+vG)M=!I}<yKgC-
zXaUbJu$K-OXZ^wgyPxwQ-s0N+^Tz@4HV!@3sraR=tbu!X=oY+$88JSe@tE)xKz)yQ
z@U>U><$eQZ`*ziQkJBPanSeb$7RNe<Da7^(cTAM`^6{a5EIU!~JI<Bz^cGcYD!Sxu
zZ7Gfc<x~7(B~v*82lT;fZ$M!Ew)!x75i<ngz|l>;`Ywcuv&VZpJp#_L(R`W7YmNl@
zmLYz)5r2jD`=Fa;Opf#y4Uf6CqWU>_MCb4DX9NA%+yR#=k*m{}*6<jE7aU@~=XGH8
zG*RybCd2w*0Pw9DIq1@_Gw@pTb|%*aI?~Y7Hd_xZo?(*Jff5SarmyQWE?PPV-=_Jd
z7eSxP`kp}Olo|;i4i8%3aQIKI1fMewfs2|Jp{FCuQ;fApmSGYnpSTpE4P#!&uxTO3
z8tiBTu{1D*nTv-B`me10we+QqBw@LlFAWol)y7W>H9}8!p~1n+6V~2|wicbe<IE&K
zfOsth|B-rhj+xcjfl9+(+5Exo8b=CxUPMJ2nxCq=f=_7U-SboOlWUw9rUPv!&3DzR
z3lF=0npInn;`GGQ;E<7{-?F<5_g#EMq77J%_o+7KqQ0QPVU|>DqO<L<I)#pGgxPQ6
z4&`R79Qpz);}QNjI}m=3=nKE=kc<Xn!>QKvyi=`Hi5-@Tgzdy#1HT8+6iFw4S?3C6
z+CX?1$yp%B^*-7*;4#%g1Y&x3iriqDL@0J!l%=Ci^XvE-+sdw`2IuB*-C0i6{2Uml
zhO%t2@Os27(O3Nn+ZL7PQDjv9H`pXzqGf8jM)NLWcDBNUj6+j(Z2d!RPrkAUQ45p4
zlRMi!WOd&-clKH)E?lsHf(WfvTf@({WdW6gdgk2@itpzP+alQ<xBj~Esy;BodQEPv
zf4kmJYavvt_B*i=U~&(`uN`abKH(C-xyUDp?WC2d(=r?{DxjFzS~H+@C+XnyS@{Ec
zKE2k9B3auFl-v!cD_ZC6k{*YiiPK-7fJcNXpNw<X@_P5fvO(VRn?hgAaP*f9d)c3+
zt^`4TiE39pi|ilKOCB8*1jef#`ioxqQ<teX-Rs4&T28p<oXfCRn@buR{FA8ZosL3r
zd&?U<EUCEkXj@6v>BoEGyQakpj%}q%4MwY6*I_+8qm+QxPMb)rcM1{}n@CJr<M5_)
zyp-N!NM9wwEJ5ina+p})v7&pmPCC^&ZWDq}#~z@%fP(`UlM|Z0lf&<y<lpF@5V<dG
zyshvqGS2pnQljI-aQSHCX7fuaM}8pNPF@u-e8}?vwe<5DNEds)9bVHkx8hW3Gq30>
zl+>+w)<u^4?Zq_LB|!&@!dXXCg>pOog4*|wvG<EML7=9aqa%LH<Lw_|+#u^<(blkC
z7h<Sboz})k^I|b^+b8^OSz3pfzX5P+{u=o0Q@`hE!vYvv^3v2b+Rl(Zr(KGf2)z@<
zF?x?oyiDCi$xG_0?4+P~&ES%1+uMccU0j5bSpfq~*p^d_z7YIPm$oD560O|4xsSFJ
z-)j^RwpD<RwDpsO^KNIMcXKw3tXhAhqYX{sC80Gx<IskvY)L-s&tkNpZHeR_YrQ^Z
zkK*vVN2$wJVU@2hURX-xOK!6BBXSYdQ2u&-d@Z&cKP?rcUU(Nv!cWVFs%PB74&bL@
zk?OHtlb=>aNKQ}GZ(oFV^<yQIZZkG~Ks1B97rMounyJqN1u}d-3Y^!>!!cyDx#t(j
zH>XC%L}zAr1vOJ}4Bti`!{PL#7cFG%?w%uLL@|y5XXd!p`WUnus?wN8NCQYg9cOVM
z0#^S=C9B<=XwRy1zS=$D`*F4-t9OJ+t7fnnUHm246td0Kwzid?r|{kF3$Z>{dJpsO
zDCh-cn6YvX2U?>$@HUL!QXt(@pePBZEh2D-2N#nBlU(L6@CFop_*wL_)=oA3i?6q4
zU_juYY263QJtF}R?SnGC*^g#rlO3ayyagDUc|`a=A4vqs!LQa$F8vGWvXD~1;bo2W
z2#VzB%sEHTPc6NN&eHP39a>+7zOm0t8NVH?H@$ERtr~DtzT{WyEdpQv-HUrWb{sgi
zMsk>cIdr6ad=kYrXcfV3@tWDT)#ZJ!7|mw}fxq*QL(O?ddSh@P?C-80EWGvm9-t7k
z{rhGh8nk`zTtC~DUXbGs$19Tg*IwWF9o~H&LSt9tOd=J;u8|;Z&CoDY_hb1o1*7G4
ytXqhRg8}O|5{CBPf$yJU+hARZ{EsJUafj1Nu}e$5{e>25D$3LbS$pzQ%)bCQq-O8{

diff --git a/Tests/images/imagedraw_ellipse_zero_width.png b/Tests/images/imagedraw_ellipse_zero_width.png
index f14a279f2fe2b17911e7fa8ced05c4829d5d7b0f..6661b7d999e37cf6593cc469b9055ff2c048c09c 100644
GIT binary patch
delta 306
zcmcc2be3s?O1+4ui(^Q|oVT|P^A0=kusEpdKfiq0%HwgU$2`_ETbibSYidoHyN;Uy
z3>voA&i%)v|LWRO*X5^IP3<?a3=fn2`$Jd#)T;iTs>6AaUsv3)-#7hP%w+pay`S6H
zZhH0b=k-$EsiD%&V$04<4}C0rEsb}2=;n{7h1E~5I`~Gpxc>O5RVyDfUlz}ootM9C
zjg;rvkoqNOxp=08{+(zZT0HM8SIP9yvz7lt=O&tIFIdyCiD_+WXnMr#EbmQ`jH#?s
zL<7PcV2lI4nFrFqLI>v8GtL(Ma6l<xGn3pVww$m72PZTryEC@mWa{%|lR3a^aZC2Y
xC5HpMt+g5RTUqzyOIXBSTfM846XMN;i~P?r<m0?1db|V)c)I$ztaD0e0sx@ahOz(v

delta 312
zcmX@hbeU;_O1+e)i(^Q|oVT|f`wkfhupH3QpTGP)r^=S;U($~GEm>8Z;he3*(%H|<
z00s@0>&o^wZr@dNaL?V;tCOai+zbi3tETcXYVU)K-xYTk`9)hteqC|HUd%7d*5K#u
zNheo{cI!lB)NRVDX-&=MogTXRV|VzSkGVf0CZ}Fa_%^My{`jd?D<AZ(zTMV1b5oXz
zY4G2P%&DREPwYdB=jBQSge};;ChOepRaS?6!W<$SuWedoyvBE{>dZ9_o0v{<X=pD%
zVbr~20V!jw|HlfZw;y84+r*Z0xPjf7NzRh%MjK<lC!0-!bVNnQ0y*h_&n`G57#??A
uzAN<#C!ZDT9CMyGdaoDj#Y4QxVDMgi#cJ6&|J)7fAQ4YjKbLh*2~7aVwTQ<6

diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py
index f6eabb21a..cc29c097e 100644
--- a/Tests/test_imagedraw.py
+++ b/Tests/test_imagedraw.py
@@ -286,14 +286,14 @@ def test_ellipse_edge():
     draw = ImageDraw.Draw(im)
 
     # Act
-    draw.ellipse(((0, 0), (W - 1, H)), fill="white")
+    draw.ellipse(((0, 0), (W - 1, H - 1)), fill="white")
 
     # Assert
     assert_image_similar(im, Image.open("Tests/images/imagedraw_ellipse_edge.png"), 1)
 
 
 def test_ellipse_symmetric():
-    for bbox in [(25, 25, 76, 76), (25, 25, 75, 75)]:
+    for bbox in [(24, 25, 76, 75), (25, 25, 75, 75), (25, 24, 75, 76)]:
         im = Image.new("RGB", (101, 101))
         draw = ImageDraw.Draw(im)
         draw.ellipse(bbox, fill="green", outline="blue")
diff --git a/Tests/test_imagedraw2.py b/Tests/test_imagedraw2.py
index 72cbb79b8..c26cc0d94 100644
--- a/Tests/test_imagedraw2.py
+++ b/Tests/test_imagedraw2.py
@@ -79,7 +79,7 @@ def test_ellipse_edge():
     brush = ImageDraw2.Brush("white")
 
     # Act
-    draw.ellipse(((0, 0), (W - 1, H)), brush)
+    draw.ellipse(((0, 0), (W - 1, H - 1)), brush)
 
     # Assert
     assert_image_similar(im, Image.open("Tests/images/imagedraw_ellipse_edge.png"), 1)
diff --git a/src/libImaging/Draw.c b/src/libImaging/Draw.c
index ee3a3938e..34d1d4bc5 100644
--- a/src/libImaging/Draw.c
+++ b/src/libImaging/Draw.c
@@ -1047,78 +1047,76 @@ int8_t quarter_next(quarter_state* s, int32_t* ret_x, int32_t* ret_y) {
 typedef struct {
     quarter_state st_o, st_i;
     int32_t py, pl, pr;
-    int32_t cy, cl, cr;
-    // 0 - ready to take next quarter piece, 1, 2, 3 - returned 1, 2, 3 hlines
-    int8_t state;
+    int32_t cy[4], cl[4], cr[4];
+    int8_t bufcnt;
     int8_t finished;
+    int8_t leftmost;
 } ellipse_state;
 
 void ellipse_init(ellipse_state* s, int32_t a, int32_t b, int32_t w) {
-    s->state = 0;
+    s->bufcnt = 0;
+    s->leftmost = a % 2;
     quarter_init(&s->st_o, a, b);
     if (w < 1 || quarter_next(&s->st_o, &s->pr, &s->py) == -1) {
         s->finished = 1;
     } else {
         s->finished = 0;
         quarter_init(&s->st_i, a - 2 * (w - 1), b - 2 * (w - 1));
-        s->pl = a % 2;
+        s->pl = s->leftmost;
     }
 }
 
 int8_t ellipse_next(ellipse_state* s, int32_t* ret_x0, int32_t* ret_y, int32_t* ret_x1) {
-    switch (s->state) {
-        case 0: {
-            if (s->finished) {
-                return -1;
-            }
-            s->cy = s->py;
-            s->cl = s->pl;
-            s->cr = s->pr;
-            int32_t cx = 0, cy = 0;
-            int8_t next_ret;
-            while ((next_ret = quarter_next(&s->st_o, &cx, &cy)) != -1 && cy <= s->cy) {
-            }
-            s->pr = cx;
-            s->py = cy;
-            if (next_ret == -1) {
-                s->finished = 1;
-            }
-            while ((next_ret = quarter_next(&s->st_i, &cx, &cy)) != -1 && cy <= s->cy) {
-                s->cl = cx;
-            }
-            s->pl = next_ret == -1 ? 0 : cx;
-            *ret_x0 = -s->cr;
-            *ret_y = -s->cy;
-            *ret_x1 = -s->cl;
-            s->state = 1;
-            return 0;
-        }
-        case 1: {
-            *ret_x0 = s->cl;
-            *ret_y = -s->cy;
-            *ret_x1 = s->cr;
-            s->state = 2;
-            return 0;
-        }
-        case 2: {
-            *ret_x0 = -s->cr;
-            *ret_y = s->cy;
-            *ret_x1 = -s->cl;
-            s->state = 3;
-            return 0;
-        }
-        case 3: {
-            *ret_x0 = s->cl;
-            *ret_y = s->cy;
-            *ret_x1 = s->cr;
-            s->state = 0;
-            return 0;
-        }
-        default: {
-            assert(0);
+    if (s->bufcnt == 0) {
+        if (s->finished) {
             return -1;
         }
+        int32_t y = s->py;
+        int32_t l = s->pl;
+        int32_t r = s->pr;
+        int32_t cx = 0, cy = 0;
+        int8_t next_ret;
+        while ((next_ret = quarter_next(&s->st_o, &cx, &cy)) != -1 && cy <= y) {
+        }
+        if (next_ret == -1) {
+            s->finished = 1;
+        } else {
+            s->pr = cx;
+            s->py = cy;
+        }
+        while ((next_ret = quarter_next(&s->st_i, &cx, &cy)) != -1 && cy <= y) {
+            l = cx;
+        }
+        s->pl = next_ret == -1 ? s->leftmost : cx;
+
+        if ((l > 0 || l < r) && y > 0) {
+            s->cl[s->bufcnt] = l == 0 ? 2 : l;
+            s->cy[s->bufcnt] = y;
+            s->cr[s->bufcnt] = r;
+            ++s->bufcnt;
+        }
+        if (y > 0) {
+            s->cl[s->bufcnt] = -r;
+            s->cy[s->bufcnt] = y;
+            s->cr[s->bufcnt] = -l;
+            ++s->bufcnt;
+        }
+        if (l > 0 || l < r) {
+            s->cl[s->bufcnt] = l == 0 ? 2 : l;
+            s->cy[s->bufcnt] = -y;
+            s->cr[s->bufcnt] = r;
+            ++s->bufcnt;
+        }
+        s->cl[s->bufcnt] = -r;
+        s->cy[s->bufcnt] = -y;
+        s->cr[s->bufcnt] = -l;
+        ++s->bufcnt;
     }
+    --s->bufcnt;
+    *ret_x0 = s->cl[s->bufcnt];
+    *ret_y = s->cy[s->bufcnt];
+    *ret_x1 = s->cr[s->bufcnt];
+    return 0;
 }
 
 static int