Merge branch 'clamp-coordinates' into 'master'

Clamp path coordinates

Closes poppler/poppler#1250

See merge request cairo/cairo!325

26 files changed, 6 insertions, 3 deletions

diff --git a/test/long-lines.c b/test/long-lines.c
index 69b64e9c4..ff28edbd8 100644
--- a/test/long-lines.c
+++ b/test/long-lines.c
@@ -29,6 +29,9 @@
 #define LINE_WIDTH	1.
 #define SIZE		10
 #define LINE_NBR	6
+#define WIDTH (SIZE * (LINE_NBR + 1))
+#define HEIGHT (SIZE * (LINE_NBR + 1))
+
 
 struct {
     double length;
@@ -66,8 +69,8 @@ draw (cairo_t *cr, int width, int height)
     }
 
     /* This should display a perfect vertically centered black line */
-    cairo_move_to (cr, 0.5, -1e100);
-    cairo_line_to (cr, pos,  1e100);
+    cairo_move_to (cr, -1e100, HEIGHT/2);
+    cairo_line_to (cr, 1e100, HEIGHT/2);
     cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
     cairo_stroke (cr);
 
@@ -80,6 +83,6 @@ CAIRO_TEST (long_lines,
 	    "\nLong lines are not drawn due to the limitations of the internal 16.16 fixed-point coordinates",
 	    "stroke, stress", /* keywords */
 	    NULL, /* requirements */
-	    SIZE * (LINE_NBR + 1), SIZE * (LINE_NBR + 1),
+	    WIDTH, HEIGHT,
 	    NULL, draw)
 
diff --git a/test/reference/big-trap.base.argb32.ref.png b/test/reference/big-trap.base.argb32.ref.png
deleted file mode 100644
index c0975c9b5..000000000
--- a/test/reference/big-trap.base.argb32.ref.png
+++ /dev/null
diff --git a/test/reference/big-trap.base.rgb24.ref.png b/test/reference/big-trap.base.rgb24.ref.png
deleted file mode 100644
index c0975c9b5..000000000
--- a/test/reference/big-trap.base.rgb24.ref.png
+++ /dev/null
diff --git a/test/reference/big-trap.mask.argb32.ref.png b/test/reference/big-trap.mask.argb32.ref.png
deleted file mode 100644
index c0975c9b5..000000000
--- a/test/reference/big-trap.mask.argb32.ref.png
+++ /dev/null
diff --git a/test/reference/big-trap.mask.rgb24.ref.png b/test/reference/big-trap.mask.rgb24.ref.png
deleted file mode 100644
index c0975c9b5..000000000
--- a/test/reference/big-trap.mask.rgb24.ref.png
+++ /dev/null
diff --git a/test/reference/big-trap.ref.png b/test/reference/big-trap.ref.png
new file mode 100644
index 000000000..dd91ff04b
--- /dev/null
+++ b/test/reference/big-trap.ref.png
diff --git a/test/reference/big-trap.traps.argb32.ref.png b/test/reference/big-trap.traps.argb32.ref.png
deleted file mode 100644
index c0975c9b5..000000000
--- a/test/reference/big-trap.traps.argb32.ref.png
+++ /dev/null
diff --git a/test/reference/big-trap.traps.rgb24.ref.png b/test/reference/big-trap.traps.rgb24.ref.png
deleted file mode 100644
index c0975c9b5..000000000
--- a/test/reference/big-trap.traps.rgb24.ref.png
+++ /dev/null
diff --git a/test/reference/huge-linear.pdf.ref.png b/test/reference/huge-linear.pdf.ref.png
deleted file mode 100644
index cdafafa24..000000000
--- a/test/reference/huge-linear.pdf.ref.png
+++ /dev/null
diff --git a/test/reference/huge-linear.pdf.xfail.png b/test/reference/huge-linear.pdf.xfail.png
new file mode 100644
index 000000000..db4cf2e9b
--- /dev/null
+++ b/test/reference/huge-linear.pdf.xfail.png
diff --git a/test/reference/huge-radial.pdf.ref.png b/test/reference/huge-radial.pdf.ref.png
deleted file mode 100644
index 8aa088b44..000000000
--- a/test/reference/huge-radial.pdf.ref.png
+++ /dev/null
diff --git a/test/reference/huge-radial.pdf.xfail.png b/test/reference/huge-radial.pdf.xfail.png
new file mode 100644
index 000000000..db4cf2e9b
--- /dev/null
+++ b/test/reference/huge-radial.pdf.xfail.png
diff --git a/test/reference/long-lines.base.argb32.ref.png b/test/reference/long-lines.base.argb32.ref.png
deleted file mode 100644
index fe9116312..000000000
--- a/test/reference/long-lines.base.argb32.ref.png
+++ /dev/null
diff --git a/test/reference/long-lines.base.rgb24.ref.png b/test/reference/long-lines.base.rgb24.ref.png
deleted file mode 100644
index fe9116312..000000000
--- a/test/reference/long-lines.base.rgb24.ref.png
+++ /dev/null
diff --git a/test/reference/long-lines.mask.argb32.ref.png b/test/reference/long-lines.mask.argb32.ref.png
deleted file mode 100644
index fe9116312..000000000
--- a/test/reference/long-lines.mask.argb32.ref.png
+++ /dev/null
diff --git a/test/reference/long-lines.mask.rgb24.ref.png b/test/reference/long-lines.mask.rgb24.ref.png
deleted file mode 100644
index fe9116312..000000000
--- a/test/reference/long-lines.mask.rgb24.ref.png
+++ /dev/null
diff --git a/test/reference/long-lines.pdf.ref.png b/test/reference/long-lines.pdf.ref.png
new file mode 100644
index 000000000..e19309407
--- /dev/null
+++ b/test/reference/long-lines.pdf.ref.png
diff --git a/test/reference/long-lines.ps.xfail.png b/test/reference/long-lines.ps.xfail.png
new file mode 100644
index 000000000..766efb75b
--- /dev/null
+++ b/test/reference/long-lines.ps.xfail.png
diff --git a/test/reference/long-lines.ref.png b/test/reference/long-lines.ref.png
new file mode 100644
index 000000000..6e9674346
--- /dev/null
+++ b/test/reference/long-lines.ref.png
diff --git a/test/reference/long-lines.traps.argb32.ref.png b/test/reference/long-lines.traps.argb32.ref.png
deleted file mode 100644
index fe9116312..000000000
--- a/test/reference/long-lines.traps.argb32.ref.png
+++ /dev/null
diff --git a/test/reference/long-lines.traps.rgb24.ref.png b/test/reference/long-lines.traps.rgb24.ref.png
deleted file mode 100644
index fe9116312..000000000
--- a/test/reference/long-lines.traps.rgb24.ref.png
+++ /dev/null
diff --git a/test/reference/long-lines.xcb-window&.ref.png b/test/reference/long-lines.xcb-window&.ref.png
new file mode 100644
index 000000000..ae94477a7
--- /dev/null
+++ b/test/reference/long-lines.xcb-window&.ref.png
diff --git a/test/reference/long-lines.xcb-window.ref.png b/test/reference/long-lines.xcb-window.ref.png
new file mode 100644
index 000000000..ae94477a7
--- /dev/null
+++ b/test/reference/long-lines.xcb-window.ref.png
diff --git a/test/reference/long-lines.xcb.ref.png b/test/reference/long-lines.xcb.ref.png
new file mode 100644
index 000000000..ae94477a7
--- /dev/null
+++ b/test/reference/long-lines.xcb.ref.png
diff --git a/test/reference/long-lines.xlib-window.ref.png b/test/reference/long-lines.xlib-window.ref.png
new file mode 100644
index 000000000..ae94477a7
--- /dev/null
+++ b/test/reference/long-lines.xlib-window.ref.png
diff --git a/test/reference/long-lines.xlib.ref.png b/test/reference/long-lines.xlib.ref.png
new file mode 100644
index 000000000..ae94477a7
--- /dev/null
+++ b/test/reference/long-lines.xlib.ref.png