Index: test/cairo-test.c
===================================================================
RCS file: /cvs/cairo/cairo/test/cairo-test.c,v
retrieving revision 1.61
diff -u -r1.61 cairo-test.c
--- test/cairo-test.c	8 Oct 2005 18:58:20 -0000	1.61
+++ test/cairo-test.c	25 Oct 2005 22:59:00 -0000
@@ -342,8 +342,11 @@
 }
 
 static cairo_surface_t *
-create_xcb_surface (int width, int height, void **closure)
+create_xcb_surface (cairo_test_t *test, cairo_format_t format,
+                    void **closure)
 {
+    int width = test->width;
+    int height = test->height;
     XCBSCREEN *root;
     xcb_target_closure_t *xtc;
     cairo_surface_t *surface;
@@ -373,7 +376,7 @@
 			 width, height);
     }
 
-    render_format = _format_from_cairo (c, CAIRO_FORMAT_ARGB32);
+    render_format = _format_from_cairo (c, format);
     if (render_format.id.xid == 0)
 	return NULL;
     surface = cairo_xcb_surface_create_with_xrender_format (c, xtc->drawable,