From bd168e15ca9dbd2a02ad5e2f7df1a661d534d679 Mon Sep 17 00:00:00 2001 From: David Reveman Date: Wed, 11 May 2005 13:30:56 +0000 Subject: [PATCH] Fix fill_rectangles and show_glyphs in glitz backend --- ChangeLog | 7 +++++++ src/cairo-glitz-surface.c | 12 +++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c9b52fb70..defa93f8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-05-11 David Reveman + + * src/cairo-glitz-surface.c (_cairo_glitz_surface_fill_rectangles): + Set fill type repeat on source surface. + (_cairo_glitz_surface_show_glyphs): Add missing cairo operator to + glitz operator conversion. + 2005-05-11 Owen Taylor * src/cairo-xlib-surface.c src/cairo-xlib.h: Remove leftover diff --git a/src/cairo-glitz-surface.c b/src/cairo-glitz-surface.c index 0987054c5..bab9f5001 100644 --- a/src/cairo-glitz-surface.c +++ b/src/cairo-glitz-surface.c @@ -937,6 +937,8 @@ _cairo_glitz_surface_fill_rectangles (void *abstract_dst, (cairo_color_t *) color); if (!src) return CAIRO_STATUS_NO_MEMORY; + + glitz_surface_set_fill (src->surface, GLITZ_FILL_REPEAT); while (n_rects--) { @@ -2003,14 +2005,14 @@ _cairo_glitz_surface_show_glyphs (cairo_scaled_font_t *scaled_font, goto UNLOCK; } - glitz_composite (op, + glitz_composite (_glitz_operator (op), src->surface, - clone->surface, + clone->surface, dst->surface, src_x + attributes.base.x_offset + x1, src_y + attributes.base.y_offset + y1, - 0, 0, - x1, y1, + 0, 0, + x1, y1, image_entry->size.width, image_entry->size.height); @@ -2038,7 +2040,7 @@ _cairo_glitz_surface_show_glyphs (cairo_scaled_font_t *scaled_font, glitz_set_array (dst->surface, 0, 4, cached_glyphs * 4, 0, 0); - glitz_composite (op, + glitz_composite (_glitz_operator (op), src->surface, cache->surface, dst->surface,