[cairo-commit] cairo/src cairo-glitz-surface.c,1.36,1.37

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv29004/src

Modified Files:
	cairo-glitz-surface.c 
Log Message:
Fix fill_rectangles and show_glyphs in glitz backend

Index: cairo-glitz-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-glitz-surface.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- cairo-glitz-surface.c	6 May 2005 21:20:05 -0000	1.36
+++ cairo-glitz-surface.c	11 May 2005 20:30:57 -0000	1.37
@@ -937,6 +937,8 @@
 						 (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 @@
 		    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 @@
 
 	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,