From d356deb18201dd8054cff158c95c6fd6f0f38dcd Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 2 Aug 2011 15:37:50 +0100 Subject: [PATCH] test: Add a second ring to overlapping-dash-caps Demonstrate a second artefact when using SQUARE. Signed-off-by: Chris Wilson --- test/overlapping-dash-caps.c | 19 ++++++++++++++----- test/overlapping-dash-caps.ref.png | Bin 3127 -> 3982 bytes 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/test/overlapping-dash-caps.c b/test/overlapping-dash-caps.c index 0d06d117a..f7ba248c2 100644 --- a/test/overlapping-dash-caps.c +++ b/test/overlapping-dash-caps.c @@ -31,22 +31,31 @@ static cairo_test_status_t draw (cairo_t *cr, int width, int height) { - double dashes[] = {20, 10}; + double dashes1[] = {20, 10}; + double dashes2[] = {10, 1}; cairo_set_source_rgb (cr, 1, 1, 1); cairo_paint (cr); - cairo_set_source_rgba (cr, 0, 0, 0, 0.5); + cairo_set_line_width (cr, 15); + cairo_set_dash (cr, dashes1, 2, 0); cairo_new_sub_path (cr); cairo_arc (cr, SIZE/2, SIZE/2, SIZE/2-10, 0, 2*M_PI); - cairo_set_dash (cr, dashes, 2, 0); + cairo_set_source_rgba (cr, 1, 0, 0, 0.5); cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND); - cairo_set_line_width (cr, 15); - cairo_stroke (cr); + cairo_set_dash (cr, dashes2, 2, 0); + cairo_new_sub_path (cr); + cairo_arc (cr, SIZE/2, SIZE/2, SIZE/4-5, 0, 2*M_PI); + + cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE); + cairo_set_source_rgba (cr, 0, 1, 0, 0.5); + cairo_stroke (cr); + + return CAIRO_TEST_SUCCESS; } diff --git a/test/overlapping-dash-caps.ref.png b/test/overlapping-dash-caps.ref.png index 13d1664f535bfed8651a8e630ea89de573633404..6b3b0ce1d0269a0c5acfe3969a74c7916bc19832 100644 GIT binary patch delta 3966 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 delta 3105 zcmV++4BqpOAGa8gHGd22Nkl+fNfu6vy{cd!ZCcp;2go76n|jLJ%?0D4P5b zDG`X=6dw#Rfj9peP4r2l4}wYvC@7-Ph@wF80-{s|DHr9|7HFlk#ogaSNvQ?encZ!> zBz~Ttoy+MryR&oV%$!9jibDPY1{Q7ub`rdB8-O^SPLs)GwSQWjPN&1+a5x+;mkU7< zKA+F$^92F{pU;;_B(brvd_F(CriMo>qtR$E7-nW>OeWLP(h^{;=;-L!*w{UL_N1hw zBqb$i;6`R;aC=}-9Avt(^;ZGL{%|vDj+0(l(~2r$;OnpE`94 z)Of(#u&=MLrKN?oS?islXhA_iPEHQPcIGXB$7&{IF4f&R$5vr7K@p**4o-SF);yBGVqmU zx7%;tya~RZxf!8Qn46oMot?dF*Dl(P_+epT;oiM_Oe~C!j;^h(jfjZwUo5a#_4V~% zzka1>1d5_=S5_jC&}#t@o6XkN);2geNPoM9)YR0fsw)2v#{goDkB{HEbBA8{B9W-1 zq$E8(onCbseEs^hsi}#!KVMi_c=YH|KLrAeSsfi6^g3236t%Urp;QV%5P~3TYHH%+ zM}$olU==fl^_Tjbyrtc+uGXv6o2q1 zmdRwI;W_5y* zI2eXqxNu>4c^PWt_2Un0{o8ap-GAM?cftFRNFt|B zSoqhkU&F)0TYlv$R&Q@F_zYOBR##V7@87>4uzVOfd-iNV*UydFY_6-Tdw>1<_2#es z5{sg!j~_n*b}y63u3WjIR4M_>hZl)NQdLz2zDw!Fix->c5Pyj^F)?AWSOA+_TwMI~ z=MP|EE}&E@%gf8bS3Yz)ozG13FR{LT`v%@OhGAi!e8Q5NntJWpwbr@m&-Xds{%wKk$-@DCfka&y1MFT^17LXgaq)y+`;K|f``z5{`~3vxZ4oR zXf#4aP-u7(Tmb5BAW70_G;Y-O`~|oU?M5sXtJP}o^4x*P<3TOkdb=?jV$IFXfj6O6 zt9RV!?m?kYfEV^&vDpv{DxkDOFDo}t#xE=^c>Z1&Yi(_9ad8p6iGQS|B=EvqBRM%4 zys*V$@k}Sz#WI`C;G;W^<1(2H%05mJ7Z(RU%#$Q(Hk;jluh)UvkQNgY6YNdYK?TQg zsQ7?KoOQ9F!bdy$vT_4BiFf1PT7h`Payp&hl^O2LH`t*2R*^WZ>=+U`&a#m`o;cM;OB} zkH@ku5RbQ!)w^_Ui=J*wS1(r6l&h!eLnH8 zL0zd-Ub%7w&Tz!{Pr_0!Oe|EZ|$u5ClO{G_Y7=v40pU28kfZ=g*(NeE9-ZCG>a) zmO)Uf)tjg2TR6`rPMm-> znVI|d?>99yfmcx|6#Mq=+x+4&Sz`qbVsV;HMJ2`S9Vxg9i`7xQ63$ zx$5idKYaKATanM_U%q^K&z?Qo74UaP+Gev|zkhz6-jUmR`RUF_zd4GTZ6G-LT(` z2?+`3&YffTTx3w*j$*Z18yg$P#>QB08H9v{gxuWRw6rwVm(qgxDj9>p(B0iVF)5}Z*-cPni?4y`SIh&^z<~nEtc8Y*@cCLD2gsFE-oxAEH5uhrPAHIcZY2E zbg17Ih9HR3=`1