[cairo-commit] 2 commits - perf/cairo-perf-trace.c src/cairo-xcb-surface.c

[Chris Wilson]

 perf/cairo-perf-trace.c |    2 +-
 src/cairo-xcb-surface.c |   11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 55cbf525479cde8251cc9199f9db89e510d6a9c1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jun 11 15:40:27 2009 +0100

    [perf] Fix -i getopt parsing.
    
    Gah, I presumed that the ':' separated options that required arguments
    from stand-alone options. I was wrong. The ':' indicates that the
    preceding option takes an argument. So add it back to -i.

diff --git a/perf/cairo-perf-trace.c b/perf/cairo-perf-trace.c
index 790e836..2a46863 100644
--- a/perf/cairo-perf-trace.c
+++ b/perf/cairo-perf-trace.c
@@ -461,7 +461,7 @@ parse_options (cairo_perf_t *perf, int argc, char *argv[])
     perf->num_exclude_names = 0;
 
     while (1) {
-	c = _cairo_getopt (argc, argv, "ix:lrv");
+	c = _cairo_getopt (argc, argv, "i:x:lrv");
 	if (c == -1)
 	    break;
 
commit 614bfdc0846856653a742b035e70d009b0a716cc
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jun 11 15:35:05 2009 +0100

    [xcb] Trivial compile fix.
    
    Update show_glyphs() interface.

diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
index 78d9a00..a7340cf 100644
--- a/src/cairo-xcb-surface.c
+++ b/src/cairo-xcb-surface.c
@@ -1585,7 +1585,6 @@ _cairo_xcb_surface_set_clip_region (void           *abstract_surface,
 	    xcb_render_change_picture (surface->dpy, surface->dst_picture,
 		XCB_RENDER_CP_CLIP_MASK, none);
     } else {
-	cairo_status_t status;
 	xcb_rectangle_t *rects = NULL;
 	int n_rects, i;
 
@@ -1603,13 +1602,13 @@ _cairo_xcb_surface_set_clip_region (void           *abstract_surface,
 	    cairo_rectangle_int_t rect;
 
 	    cairo_region_get_rectangle (region, i, &rect);
-	    
+
 	    rects[i].x = rect.x;
 	    rects[i].y = rect.y;
 	    rects[i].width = rect.width;
 	    rects[i].height = rect.height;
 	}
- 
+
 	surface->have_clip_rects = TRUE;
 	surface->clip_rects = rects;
 	surface->num_clip_rects = n_rects;
@@ -1655,7 +1654,8 @@ _cairo_xcb_surface_show_glyphs (void			*abstract_dst,
 				cairo_glyph_t		*glyphs,
 				int			 num_glyphs,
 				cairo_scaled_font_t	*scaled_font,
-				int			*remaining_glyphs);
+				int			*remaining_glyphs,
+				cairo_rectangle_int_t   *extents);
 
 static cairo_bool_t
 _cairo_xcb_surface_is_similar (void *surface_a,
@@ -2463,7 +2463,8 @@ _cairo_xcb_surface_show_glyphs (void			*abstract_dst,
 				cairo_glyph_t		*glyphs,
 				int			 num_glyphs,
 				cairo_scaled_font_t	*scaled_font,
-				int			*remaining_glyphs)
+				int			*remaining_glyphs,
+				cairo_rectangle_int_t   *extents)
 {
     cairo_int_status_t status = CAIRO_STATUS_SUCCESS;
     cairo_xcb_surface_t *dst = abstract_dst;