[cairo] [PATCH 06/12] boilerplate: Remove unused thread id parameter
Andrea Canciani
ranma42 at gmail.com
Sat Nov 12 13:19:58 PST 2011
The thread id is not used anymore (it is always == 0), so it can be
removed.
---
boilerplate/cairo-boilerplate-cogl.c | 2 -
boilerplate/cairo-boilerplate-directfb.c | 1 -
boilerplate/cairo-boilerplate-drm.c | 1 -
boilerplate/cairo-boilerplate-egl.c | 1 -
boilerplate/cairo-boilerplate-glx.c | 3 --
boilerplate/cairo-boilerplate-pdf.c | 1 -
boilerplate/cairo-boilerplate-ps.c | 7 +---
boilerplate/cairo-boilerplate-qt.cpp | 1 -
boilerplate/cairo-boilerplate-quartz.c | 1 -
boilerplate/cairo-boilerplate-script.c | 1 -
boilerplate/cairo-boilerplate-skia.c | 1 -
boilerplate/cairo-boilerplate-svg.c | 7 +---
boilerplate/cairo-boilerplate-test-surfaces.c | 9 -----
boilerplate/cairo-boilerplate-vg.c | 2 -
boilerplate/cairo-boilerplate-wgl.c | 2 -
boilerplate/cairo-boilerplate-win32-printing.c | 1 -
boilerplate/cairo-boilerplate-win32.c | 1 -
boilerplate/cairo-boilerplate-xcb.c | 5 ---
boilerplate/cairo-boilerplate-xlib.c | 45 ++---------------------
boilerplate/cairo-boilerplate.c | 3 --
boilerplate/cairo-boilerplate.h | 1 -
perf/cairo-analyse-trace.c | 1 -
perf/cairo-perf-micro.c | 1 -
perf/cairo-perf-trace.c | 1 -
test/cairo-test-trace.c | 1 -
test/cairo-test.c | 2 -
test/fallback-resolution.c | 2 -
test/ps-eps.c | 1 -
util/cairo-sphinx/sphinx.c | 2 +-
29 files changed, 9 insertions(+), 98 deletions(-)
diff --git a/boilerplate/cairo-boilerplate-cogl.c b/boilerplate/cairo-boilerplate-cogl.c
index 8dda317..e39ad33 100644
--- a/boilerplate/cairo-boilerplate-cogl.c
+++ b/boilerplate/cairo-boilerplate-cogl.c
@@ -66,7 +66,6 @@ _cairo_boilerplate_cogl_create_offscreen_color_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **abstract_closure)
{
cairo_device_t *device;
@@ -116,7 +115,6 @@ _cairo_boilerplate_cogl_create_onscreen_color_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **abstract_closure)
{
cairo_device_t *device;
diff --git a/boilerplate/cairo-boilerplate-directfb.c b/boilerplate/cairo-boilerplate-directfb.c
index be5efb6..a479011 100644
--- a/boilerplate/cairo-boilerplate-directfb.c
+++ b/boilerplate/cairo-boilerplate-directfb.c
@@ -175,7 +175,6 @@ _cairo_boilerplate_directfb_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
diff --git a/boilerplate/cairo-boilerplate-drm.c b/boilerplate/cairo-boilerplate-drm.c
index 8f04314..214ce50 100644
--- a/boilerplate/cairo-boilerplate-drm.c
+++ b/boilerplate/cairo-boilerplate-drm.c
@@ -42,7 +42,6 @@ _cairo_boilerplate_drm_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
cairo_device_t *device;
diff --git a/boilerplate/cairo-boilerplate-egl.c b/boilerplate/cairo-boilerplate-egl.c
index 0e1c9b9..ce0aceb 100644
--- a/boilerplate/cairo-boilerplate-egl.c
+++ b/boilerplate/cairo-boilerplate-egl.c
@@ -72,7 +72,6 @@ _cairo_boilerplate_egl_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
egl_target_closure_t *gltc;
diff --git a/boilerplate/cairo-boilerplate-glx.c b/boilerplate/cairo-boilerplate-glx.c
index 690844e..35e8192 100644
--- a/boilerplate/cairo-boilerplate-glx.c
+++ b/boilerplate/cairo-boilerplate-glx.c
@@ -74,7 +74,6 @@ _cairo_boilerplate_gl_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
int rgba_attribs[] = { GLX_RGBA,
@@ -151,7 +150,6 @@ _cairo_boilerplate_gl_create_window (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
int rgba_attribs[] = { GLX_RGBA,
@@ -232,7 +230,6 @@ _cairo_boilerplate_gl_create_window_db (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
int rgba_attribs[] = { GLX_RGBA,
diff --git a/boilerplate/cairo-boilerplate-pdf.c b/boilerplate/cairo-boilerplate-pdf.c
index 5173780..d76d139 100644
--- a/boilerplate/cairo-boilerplate-pdf.c
+++ b/boilerplate/cairo-boilerplate-pdf.c
@@ -64,7 +64,6 @@ _cairo_boilerplate_pdf_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
pdf_target_closure_t *ptc;
diff --git a/boilerplate/cairo-boilerplate-ps.c b/boilerplate/cairo-boilerplate-ps.c
index 53c8cb8..ae61239 100644
--- a/boilerplate/cairo-boilerplate-ps.c
+++ b/boilerplate/cairo-boilerplate-ps.c
@@ -82,7 +82,6 @@ _cairo_boilerplate_ps_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
ps_target_closure_t *ptc;
@@ -144,14 +143,13 @@ _cairo_boilerplate_ps2_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
return _cairo_boilerplate_ps_create_surface (name, content,
CAIRO_PS_LEVEL_2,
width, height,
max_width, max_height,
- mode, id,
+ mode,
closure);
}
@@ -163,14 +161,13 @@ _cairo_boilerplate_ps3_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
return _cairo_boilerplate_ps_create_surface (name, content,
CAIRO_PS_LEVEL_3,
width, height,
max_width, max_height,
- mode, id,
+ mode,
closure);
}
diff --git a/boilerplate/cairo-boilerplate-qt.cpp b/boilerplate/cairo-boilerplate-qt.cpp
index bbeea4a..a559f4f 100644
--- a/boilerplate/cairo-boilerplate-qt.cpp
+++ b/boilerplate/cairo-boilerplate-qt.cpp
@@ -60,7 +60,6 @@ _cairo_boilerplate_qt_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
qt_closure_t *qtc;
diff --git a/boilerplate/cairo-boilerplate-quartz.c b/boilerplate/cairo-boilerplate-quartz.c
index 6b9697a..d4ca353 100644
--- a/boilerplate/cairo-boilerplate-quartz.c
+++ b/boilerplate/cairo-boilerplate-quartz.c
@@ -36,7 +36,6 @@ _cairo_boilerplate_quartz_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
cairo_format_t format;
diff --git a/boilerplate/cairo-boilerplate-script.c b/boilerplate/cairo-boilerplate-script.c
index f031744..da8ae3b 100644
--- a/boilerplate/cairo-boilerplate-script.c
+++ b/boilerplate/cairo-boilerplate-script.c
@@ -44,7 +44,6 @@ _cairo_boilerplate_script_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
script_target_closure_t *ptc;
diff --git a/boilerplate/cairo-boilerplate-skia.c b/boilerplate/cairo-boilerplate-skia.c
index 2bd31b0..c06e7f0 100644
--- a/boilerplate/cairo-boilerplate-skia.c
+++ b/boilerplate/cairo-boilerplate-skia.c
@@ -11,7 +11,6 @@ _cairo_boilerplate_skia_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
cairo_format_t format;
diff --git a/boilerplate/cairo-boilerplate-svg.c b/boilerplate/cairo-boilerplate-svg.c
index 310dc5d..eda2f66 100644
--- a/boilerplate/cairo-boilerplate-svg.c
+++ b/boilerplate/cairo-boilerplate-svg.c
@@ -62,7 +62,6 @@ _cairo_boilerplate_svg_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
svg_target_closure_t *ptc;
@@ -117,7 +116,6 @@ _cairo_boilerplate_svg11_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
/* current default, but be explicit in case the default changes */
@@ -125,7 +123,7 @@ _cairo_boilerplate_svg11_create_surface (const char *name,
CAIRO_SVG_VERSION_1_1,
width, height,
max_width, max_height,
- mode, id,
+ mode,
closure);
}
@@ -137,14 +135,13 @@ _cairo_boilerplate_svg12_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
return _cairo_boilerplate_svg_create_surface (name, content,
CAIRO_SVG_VERSION_1_2,
width, height,
max_width, max_height,
- mode, id,
+ mode,
closure);
}
diff --git a/boilerplate/cairo-boilerplate-test-surfaces.c b/boilerplate/cairo-boilerplate-test-surfaces.c
index 73f2503..293b77f 100644
--- a/boilerplate/cairo-boilerplate-test-surfaces.c
+++ b/boilerplate/cairo-boilerplate-test-surfaces.c
@@ -44,7 +44,6 @@ _cairo_boilerplate_test_base_compositor_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
*closure = NULL;
@@ -60,7 +59,6 @@ _cairo_boilerplate_test_fallback_compositor_create_surface (const char *name
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
*closure = NULL;
@@ -75,7 +73,6 @@ _cairo_boilerplate_test_mask_compositor_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
*closure = NULL;
@@ -91,7 +88,6 @@ _cairo_boilerplate_test_traps_compositor_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
*closure = NULL;
@@ -106,7 +102,6 @@ _cairo_boilerplate_test_spans_compositor_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
*closure = NULL;
@@ -121,7 +116,6 @@ _cairo_boilerplate_test_no_fallback_compositor_create_surface (const char *n
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
if (mode == CAIRO_BOILERPLATE_MODE_TEST)
@@ -139,7 +133,6 @@ _cairo_boilerplate_test_no_traps_compositor_create_surface (const char *name
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
if (mode == CAIRO_BOILERPLATE_MODE_TEST)
@@ -157,7 +150,6 @@ _cairo_boilerplate_test_no_spans_compositor_create_surface (const char *name
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
if (mode == CAIRO_BOILERPLATE_MODE_TEST)
@@ -182,7 +174,6 @@ _cairo_boilerplate_test_paginated_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
test_paginated_closure_t *tpc;
diff --git a/boilerplate/cairo-boilerplate-vg.c b/boilerplate/cairo-boilerplate-vg.c
index a49ed5d..ee32b3c 100644
--- a/boilerplate/cairo-boilerplate-vg.c
+++ b/boilerplate/cairo-boilerplate-vg.c
@@ -78,7 +78,6 @@ _cairo_boilerplate_vg_create_surface_glx (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
int rgba_attribs[] = {
@@ -207,7 +206,6 @@ _cairo_boilerplate_vg_create_surface_egl (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
int rgba_attribs[] = {
diff --git a/boilerplate/cairo-boilerplate-wgl.c b/boilerplate/cairo-boilerplate-wgl.c
index 8ae1dcb..9088177 100644
--- a/boilerplate/cairo-boilerplate-wgl.c
+++ b/boilerplate/cairo-boilerplate-wgl.c
@@ -109,7 +109,6 @@ _cairo_boilerplate_wgl_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
wgl_target_closure_t *wgltc;
@@ -146,7 +145,6 @@ _cairo_boilerplate_wgl_for_create_window (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
wgl_target_closure_t *wgltc;
diff --git a/boilerplate/cairo-boilerplate-win32-printing.c b/boilerplate/cairo-boilerplate-win32-printing.c
index 0e54512..c251bbf 100644
--- a/boilerplate/cairo-boilerplate-win32-printing.c
+++ b/boilerplate/cairo-boilerplate-win32-printing.c
@@ -169,7 +169,6 @@ _cairo_boilerplate_win32_printing_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
win32_target_closure_t *ptc;
diff --git a/boilerplate/cairo-boilerplate-win32.c b/boilerplate/cairo-boilerplate-win32.c
index f7be663..7469cc7 100644
--- a/boilerplate/cairo-boilerplate-win32.c
+++ b/boilerplate/cairo-boilerplate-win32.c
@@ -36,7 +36,6 @@ _cairo_boilerplate_win32_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
cairo_format_t format;
diff --git a/boilerplate/cairo-boilerplate-xcb.c b/boilerplate/cairo-boilerplate-xcb.c
index f9810ee..979f5b5 100644
--- a/boilerplate/cairo-boilerplate-xcb.c
+++ b/boilerplate/cairo-boilerplate-xcb.c
@@ -245,7 +245,6 @@ _cairo_boilerplate_xcb_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
xcb_screen_t *root;
@@ -394,7 +393,6 @@ _cairo_boilerplate_xcb_create_window (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
xcb_target_closure_t *xtc;
@@ -471,7 +469,6 @@ _cairo_boilerplate_xcb_create_window_db (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
xcb_target_closure_t *xtc;
@@ -549,7 +546,6 @@ _cairo_boilerplate_xcb_create_render_0_0 (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
xcb_screen_t *root;
@@ -651,7 +647,6 @@ _cairo_boilerplate_xcb_create_fallback (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
xcb_target_closure_t *xtc;
diff --git a/boilerplate/cairo-boilerplate-xlib.c b/boilerplate/cairo-boilerplate-xlib.c
index 38c1135..abd1ba9 100644
--- a/boilerplate/cairo-boilerplate-xlib.c
+++ b/boilerplate/cairo-boilerplate-xlib.c
@@ -280,7 +280,6 @@ _cairo_boilerplate_xlib_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
xlib_target_closure_t *xtc;
@@ -323,13 +322,11 @@ _cairo_boilerplate_xlib_window_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
xlib_target_closure_t *xtc;
Display *dpy;
- Screen *scr;
- int screen, x, y;
+ int screen;
XSetWindowAttributes attr;
cairo_surface_t *surface;
@@ -374,25 +371,9 @@ _cairo_boilerplate_xlib_window_create_surface (const char *name,
return NULL;
}
- /* tile the windows so threads do not overlap */
- scr = XScreenOfDisplay (dpy, screen);
- x = 10; y = 15;
- if (id-- > 1) do {
- x += max_width;
- if (x + max_width > WidthOfScreen (scr)) {
- x = 10;
- y += max_height;
- if (y + max_height > HeightOfScreen (scr)) {
- XCloseDisplay (dpy);
- free (xtc);
- return NULL;
- }
- }
- } while (--id);
-
attr.override_redirect = True;
xtc->drawable = XCreateWindow (dpy, DefaultRootWindow (dpy),
- x, y,
+ 0, 0,
width, height, 0,
DefaultDepth (dpy, screen),
InputOutput,
@@ -475,13 +456,11 @@ _cairo_boilerplate_xlib_fallback_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
xlib_target_closure_t *xtc;
Display *dpy;
- Screen *scr;
- int screen, x, y;
+ int screen;
XSetWindowAttributes attr;
cairo_surface_t *surface;
@@ -526,25 +505,9 @@ _cairo_boilerplate_xlib_fallback_create_surface (const char *name,
return NULL;
}
- /* tile the windows so threads do not overlap */
- scr = XScreenOfDisplay (dpy, screen);
- x = y = 0;
- if (id-- > 1) do {
- x += max_width;
- if (x + max_width > WidthOfScreen (scr)) {
- x = 0;
- y += max_height;
- if (y + max_height > HeightOfScreen (scr)) {
- XCloseDisplay (dpy);
- free (xtc);
- return NULL;
- }
- }
- } while (--id);
-
attr.override_redirect = True;
xtc->drawable = XCreateWindow (dpy, DefaultRootWindow (dpy),
- x, y,
+ 0, 0,
width, height, 0,
DefaultDepth (dpy, screen),
InputOutput,
diff --git a/boilerplate/cairo-boilerplate.c b/boilerplate/cairo-boilerplate.c
index b4b492f..89ab1ce 100644
--- a/boilerplate/cairo-boilerplate.c
+++ b/boilerplate/cairo-boilerplate.c
@@ -132,7 +132,6 @@ _cairo_boilerplate_image_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
cairo_format_t format;
@@ -188,7 +187,6 @@ _cairo_boilerplate_image16_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
*closure = NULL;
@@ -243,7 +241,6 @@ _cairo_boilerplate_recording_create_surface (const char *name,
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure)
{
cairo_rectangle_t extents;
diff --git a/boilerplate/cairo-boilerplate.h b/boilerplate/cairo-boilerplate.h
index b1a1f1c..461b98b 100644
--- a/boilerplate/cairo-boilerplate.h
+++ b/boilerplate/cairo-boilerplate.h
@@ -124,7 +124,6 @@ typedef cairo_surface_t *
double max_width,
double max_height,
cairo_boilerplate_mode_t mode,
- int id,
void **closure);
typedef cairo_surface_t *
diff --git a/perf/cairo-analyse-trace.c b/perf/cairo-analyse-trace.c
index 5e0ad70..9941486 100644
--- a/perf/cairo-analyse-trace.c
+++ b/perf/cairo-analyse-trace.c
@@ -418,7 +418,6 @@ cairo_perf_trace (cairo_perf_t *perf,
1, 1,
1, 1,
CAIRO_BOILERPLATE_MODE_PERF,
- 0,
&args.closure);
args.surface =
cairo_surface_create_observer (real,
diff --git a/perf/cairo-perf-micro.c b/perf/cairo-perf-micro.c
index 572593b..7aa20ca 100644
--- a/perf/cairo-perf-micro.c
+++ b/perf/cairo-perf-micro.c
@@ -508,7 +508,6 @@ main (int argc,
perf.size, perf.size,
perf.size, perf.size,
CAIRO_BOILERPLATE_MODE_PERF,
- 0,
&closure);
if (surface == NULL) {
fprintf (stderr,
diff --git a/perf/cairo-perf-trace.c b/perf/cairo-perf-trace.c
index 7259f2f..bd0cb07 100644
--- a/perf/cairo-perf-trace.c
+++ b/perf/cairo-perf-trace.c
@@ -699,7 +699,6 @@ cairo_perf_trace (cairo_perf_t *perf,
1, 1,
1, 1,
CAIRO_BOILERPLATE_MODE_PERF,
- 0,
&args.closure);
if (perf->observe) {
cairo_surface_t *obs;
diff --git a/test/cairo-test-trace.c b/test/cairo-test-trace.c
index fdc8a62..52d9dd9 100644
--- a/test/cairo-test-trace.c
+++ b/test/cairo-test-trace.c
@@ -591,7 +591,6 @@ spawn_target (const char *socket_path,
1, 1,
1, 1,
CAIRO_BOILERPLATE_MODE_TEST,
- 0,
&tr.closure);
if (tr.surface == NULL) {
fprintf (stderr,
diff --git a/test/cairo-test.c b/test/cairo-test.c
index bcb0fdc..1a0c845 100644
--- a/test/cairo-test.c
+++ b/test/cairo-test.c
@@ -436,7 +436,6 @@ cairo_test_target_has_similar (const cairo_test_context_t *ctx,
ctx->test->width + 25 * NUM_DEVICE_OFFSETS,
ctx->test->height + 25 * NUM_DEVICE_OFFSETS,
CAIRO_BOILERPLATE_MODE_TEST,
- 0,
&closure);
if (surface == NULL)
goto out;
@@ -821,7 +820,6 @@ REPEAT:
ctx->test->width + 25 * NUM_DEVICE_OFFSETS,
ctx->test->height + 25 * NUM_DEVICE_OFFSETS,
CAIRO_BOILERPLATE_MODE_TEST,
- 0,
&closure);
if (surface == NULL) {
cairo_test_log (ctx, "Error: Failed to set %s target\n", target->name);
diff --git a/test/fallback-resolution.c b/test/fallback-resolution.c
index 5447a56..b14cc1e 100644
--- a/test/fallback-resolution.c
+++ b/test/fallback-resolution.c
@@ -382,7 +382,6 @@ preamble (cairo_test_context_t *ctx)
SIZE, SIZE,
SIZE, SIZE,
CAIRO_BOILERPLATE_MODE_TEST,
- 0,
&closure);
if (surface == NULL) {
@@ -417,7 +416,6 @@ preamble (cairo_test_context_t *ctx)
SIZE + 25, SIZE + 25,
SIZE + 25, SIZE + 25,
CAIRO_BOILERPLATE_MODE_TEST,
- 0,
&closure);
if (surface == NULL || cairo_surface_status (surface)) {
cairo_test_log (ctx, "Failed to generate surface: %s.%s\n",
diff --git a/test/ps-eps.c b/test/ps-eps.c
index 33802f3..1961463 100644
--- a/test/ps-eps.c
+++ b/test/ps-eps.c
@@ -288,7 +288,6 @@ preamble (cairo_test_context_t *ctx)
WIDTH, HEIGHT,
WIDTH, HEIGHT,
CAIRO_BOILERPLATE_MODE_TEST,
- 0,
&closure);
if (surface == NULL) {
diff --git a/util/cairo-sphinx/sphinx.c b/util/cairo-sphinx/sphinx.c
index 40d6776..7bc1c50 100644
--- a/util/cairo-sphinx/sphinx.c
+++ b/util/cairo-sphinx/sphinx.c
@@ -1378,7 +1378,7 @@ do_client (int fd,
client.surface = client.target->create_surface (NULL, content, 1, 1, 1, 1,
CAIRO_BOILERPLATE_MODE_TEST,
- 0, &closure);
+ &closure);
if (client.surface == NULL) {
fprintf (stderr, "Failed to create target surface: %s.\n",
client.target->name);
--
1.7.5.4
More information about the cairo
mailing list