From 54c8e8ccfc242fd17144c64202f628c87edbb6f4 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat, 13 Aug 2011 13:24:52 +0100
Subject: [PATCH] test: Add a couple of variants to line-width-overlap

The bug may be in only the fast-path, but future bugs may lie elsewhere.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 test/Makefile.refs                      |   4 ++
 test/line-width-overlap-flipped.ref.png | Bin 0 -> 296 bytes
 test/line-width-overlap-flopped.ref.png | Bin 0 -> 296 bytes
 test/line-width-overlap-offset.ref.png  | Bin 0 -> 348 bytes
 test/line-width-overlap-rotated.ref.png | Bin 0 -> 866 bytes
 test/line-width-overlap.c               |  81 +++++++++++++++++++++++-
 6 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 test/line-width-overlap-flipped.ref.png
 create mode 100644 test/line-width-overlap-flopped.ref.png
 create mode 100644 test/line-width-overlap-offset.ref.png
 create mode 100644 test/line-width-overlap-rotated.ref.png

diff --git a/test/Makefile.refs b/test/Makefile.refs
index 5a733864c..c435bf6ac 100644
--- a/test/Makefile.refs
+++ b/test/Makefile.refs
@@ -690,6 +690,10 @@ REFERENCE_IMAGES = \
 	leaky-polygon.image16.ref.png \
 	leaky-polygon.ps.ref.png \
 	leaky-polygon.ref.png \
+	line-width-overlap-flipped.ref.png \
+	line-width-overlap-flopped.ref.png \
+	line-width-overlap-offset.ref.png \
+	line-width-overlap-rotated.ref.png \
 	line-width-overlap.ref.png \
 	line-width-scale.image16.ref.png \
 	line-width-scale.ps2.ref.png \
diff --git a/test/line-width-overlap-flipped.ref.png b/test/line-width-overlap-flipped.ref.png
new file mode 100644
index 0000000000000000000000000000000000000000..09911bc5191168153f408af5098bdca62c2433ee
GIT binary patch
literal 296
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1SJ1AFfjuu#^NA%Cx&(BWL^R}Y)RhkE)4%c
zaKYZ?lYt_f1s;*b3=G`DAk4@xYmNj^kiEpy*OmP?lc1o0{GYVXra++;o-U3d6}R5r
z-N?zHz~kz;f5-n*g{-<RQ>sg)`j?okoh9~~BjI2ZE4P>q%LWL8DZ*VU`tsEK_vUYk
zJSQNg69JZu*uVl*6R{zI6HFcy0<jM^se(yXZ;0M$P@^CQV$&F>W%p-8Bt$hM#E4b~
cu{F1S`?jzg4}Y0{1?Xl5Pgg&ebxsLQ0OkB$W&i*H

literal 0
HcmV?d00001

diff --git a/test/line-width-overlap-flopped.ref.png b/test/line-width-overlap-flopped.ref.png
new file mode 100644
index 0000000000000000000000000000000000000000..09911bc5191168153f408af5098bdca62c2433ee
GIT binary patch
literal 296
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1SJ1AFfjuu#^NA%Cx&(BWL^R}Y)RhkE)4%c
zaKYZ?lYt_f1s;*b3=G`DAk4@xYmNj^kiEpy*OmP?lc1o0{GYVXra++;o-U3d6}R5r
z-N?zHz~kz;f5-n*g{-<RQ>sg)`j?okoh9~~BjI2ZE4P>q%LWL8DZ*VU`tsEK_vUYk
zJSQNg69JZu*uVl*6R{zI6HFcy0<jM^se(yXZ;0M$P@^CQV$&F>W%p-8Bt$hM#E4b~
cu{F1S`?jzg4}Y0{1?Xl5Pgg&ebxsLQ0OkB$W&i*H

literal 0
HcmV?d00001

diff --git a/test/line-width-overlap-offset.ref.png b/test/line-width-overlap-offset.ref.png
new file mode 100644
index 0000000000000000000000000000000000000000..eafa50b1f9cbc436bd99e11591bc88d554f9a383
GIT binary patch
literal 348
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1SJ1AFfjuuwj^(N7l!{JxM1({$qWpPf}Spp
zAr*7p-aW{BSV4fnQD&)uRre*yxkq&k_)l-#@_FC!jY9Dj$MRDyzkbI$Z%M=g9Pokf
z<>KC*>mr}1W%rquw_9F&zWVo{-G3uuoda|R15DsodADEnhe*ky#rFfhmGU}nbifJ^
Za7vu!KCKxg=L`%k22WQ%mvv4FO#oRzcQ^n5

literal 0
HcmV?d00001

diff --git a/test/line-width-overlap-rotated.ref.png b/test/line-width-overlap-rotated.ref.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd89a854bcf9449258c6f145f9e8d123033a6459
GIT binary patch
literal 866
zcmV-o1D*VdP)<h;3K|Lk000e1NJLTq003kF003kN0ssI2|9}Dm00006VoOIv0RI60
z0RN!9r;`8x0~bj|K~#90?cGgo;y@4u;FnpE69j31VX!yk{#OYboA5UhxxujWEG&5l
zKeoGF-LJac*4u=*q5P#HLD^1TP(j<a+ylUV$*tnyR_V%mgYy)p8S;W(%x(A;+)346
zY4qY(@JLFj7r%lhQgzN#tT+7f6k$D+Qs+glpj}FrmwqWlUc}da|L7~F#fvEQ^=7<|
z>=lp{-zzLBvR80YOs^27XkLLzHD2!@(P6oes`K^c(JN>v-(I0hdG(4w%AZ#pQl7k`
zk@Df?;z?Iq92NwrI)?>T+d!~bJ#`&d{S}{-L$4^MTzSPR<-{vuDS5BBrG&i(u3v3&
zobx$4BlCV@$YT9Hbsd5J8i|yQ*Lb7^yhbI}cv;S)O&6>;VN2DqoZp*D8J$Dc92>9x
zyDoRw|KcB{V0KF^cMh;(>Z$9PT`$*Xr@X*v#y>E=*T|*JypoiGSCYE+%1SG&tQ?nA
zo#VXK>*1q|13rKAOQ&SJ!s5^yD=Wj8y12{J{z_5?UP;QpD@nC`eVeZ)srG!EM<bj$
zI^Sz{LXq<eQl28m&p-GvxnOc}aL;F4+vI}RzW^#M4%n{vKRvbi|2DOLAbE95HCV~3
zTk0Asd38wLU?s06W%lUf^!<)w8)Mz4?+5AR)i%<4wrHHck7b7W@%gt~mX6J<L#iEX
zR9@XuomjP3neh*XFVzPN73Rm7z4}V^#ERI<K&n3$VjK{5ocJ1og}D05tfwrnqVckk
zvcQVK%Tme?D`+o!DQm1iy#`4Q!3xf6sMJ6#gmW5=e>+MY{rx4-Q&L#Uy~L!Xu+(}<
zN(o{q^b(em#Zu)ZFC~tp#LJ143oN8Rf?*m~e-*i#o^pys@hWo6PA*@-Y56|AoJ+aJ
z^5*43$^(`MFHcf_u$+4Nlk$dDdx>AX>Q%}o7AoP3eSJ%L#uD@*NcqPS@#08Pum*b3
zq*z$iUQ8(>mW3Btii>6B#h0RE_4HC9r2(tcON*2etQIdtQhKl+dg+o<g>~b#Sz~(U
sm!ub~@zN+&;RTiat&9UVwf|=HA7?|#N{OVk(f|Me07*qoM6N<$f-N<xy#N3J

literal 0
HcmV?d00001

diff --git a/test/line-width-overlap.c b/test/line-width-overlap.c
index cd23d32db..ac8c23479 100644
--- a/test/line-width-overlap.c
+++ b/test/line-width-overlap.c
@@ -54,9 +54,9 @@ draw (cairo_t *cr, int width, int height)
 
     /* rectangle that is smaller than the line width in center of image */
     cairo_rectangle (cr,
-                     (SIZE - RECT_SIZE) / 2, 
                      (SIZE - RECT_SIZE) / 2,
-                     RECT_SIZE, 
+                     (SIZE - RECT_SIZE) / 2,
+                     RECT_SIZE,
                      RECT_SIZE);
 
     cairo_stroke (cr);
@@ -64,9 +64,86 @@ draw (cairo_t *cr, int width, int height)
     return CAIRO_TEST_SUCCESS;
 }
 
+/* and again slightly offset to trigger another path */
+static cairo_test_status_t
+draw_offset (cairo_t *cr, int width, int height)
+{
+    cairo_translate (cr, .5, .5);
+    return draw (cr, width, height);
+}
+
+static cairo_test_status_t
+draw_rotated (cairo_t *cr, int width, int height)
+{
+    cairo_translate (cr, SIZE/2, SIZE/2);
+    cairo_rotate (cr, M_PI/4);
+    cairo_translate (cr, -SIZE/2, -SIZE/2);
+
+    return draw (cr, width, height);
+}
+
+static cairo_test_status_t
+draw_flipped (cairo_t *cr, int width, int height)
+{
+    cairo_translate (cr, SIZE/2, SIZE/2);
+    cairo_scale (cr, -1, 1);
+    cairo_translate (cr, -SIZE/2, -SIZE/2);
+
+    return draw (cr, width, height);
+}
+
+static cairo_test_status_t
+draw_flopped (cairo_t *cr, int width, int height)
+{
+    cairo_translate (cr, SIZE/2, SIZE/2);
+    cairo_scale (cr, 1, -1);
+    cairo_translate (cr, -SIZE/2, -SIZE/2);
+
+    return draw (cr, width, height);
+}
+
+static cairo_test_status_t
+draw_dashed (cairo_t *cr, int width, int height)
+{
+    const double dashes[] = { 4 };
+    cairo_set_dash (cr, dashes, 1, 0);
+    cairo_set_line_cap (cr, CAIRO_LINE_CAP_BUTT);
+    return draw (cr, width, height);
+}
+
 CAIRO_TEST (line_width_overlap,
 	    "Test overlapping lines due to large line width",
 	    "stroke", /* keywords */
 	    NULL, /* requirements */
 	    SIZE, SIZE,
 	    NULL, draw)
+CAIRO_TEST (line_width_overlap_offset,
+	    "Test overlapping lines due to large line width",
+	    "stroke", /* keywords */
+	    NULL, /* requirements */
+	    SIZE, SIZE,
+	    NULL, draw_offset)
+CAIRO_TEST (line_width_overlap_rotated,
+	    "Test overlapping lines due to large line width",
+	    "stroke", /* keywords */
+	    NULL, /* requirements */
+	    SIZE, SIZE,
+	    NULL, draw_rotated)
+CAIRO_TEST (line_width_overlap_flipped,
+	    "Test overlapping lines due to large line width",
+	    "stroke", /* keywords */
+	    NULL, /* requirements */
+	    SIZE, SIZE,
+	    NULL, draw_flipped)
+CAIRO_TEST (line_width_overlap_flopped,
+	    "Test overlapping lines due to large line width",
+	    "stroke", /* keywords */
+	    NULL, /* requirements */
+	    SIZE, SIZE,
+	    NULL, draw_flopped)
+CAIRO_TEST (line_width_overlap_dashed,
+	    "Test overlapping lines due to large line width",
+	    "stroke", /* keywords */
+	    NULL, /* requirements */
+	    SIZE, SIZE,
+	    NULL, draw_dashed)