[cairo-commit] cairo/test cairo-test.c,1.26,1.27 mask.c,1.3,1.4

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/test
In directory gabe:/tmp/cvs-serv22833/test

Modified Files:
	cairo-test.c mask.c 
Log Message:

        * src/cairo-glitz-surface.c: (_glitz_operator),
        (_cairo_glitz_surface_fill_rectangles):
        * src/cairo-gstate.c: (_cairo_gstate_mask):
        * src/cairo-image-surface.c: (_pixman_operator),
        (_cairo_image_surface_composite_trapezoids):
        * src/cairo-ps-surface.c: (_cairo_ps_surface_erase),
        (_cairo_ps_surface_copy_page):
        * src/cairo-surface.c: (_cairo_surface_create_similar_solid):
        * src/cairo-xlib-surface.c: (_render_operator):
        * src/cairo.h:
        * test/cairo-test.c: (cairo_test_for_target):
        * test/mask.c: (mask_polygon), (draw):

        Rename and re-order the cairo_operator_t enum to names that
        abbreviate less and are easier to understand,
        (eg. CAIRO_OPERATOR_DEST_OVER instead of
        CAIRO_OPEERATOR_OVER_REVERSE).


Index: cairo-test.c
===================================================================
RCS file: /cvs/cairo/cairo/test/cairo-test.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- cairo-test.c	6 May 2005 20:23:41 -0000	1.26
+++ cairo-test.c	6 May 2005 20:26:16 -0000	1.27
@@ -271,7 +271,7 @@
 
     cairo_save (cr);
     cairo_set_source_rgba (cr, 0, 0, 0, 0);
-    cairo_set_operator (cr, CAIRO_OPERATOR_SRC);
+    cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
     cairo_paint (cr);
     cairo_restore (cr);
 

Index: mask.c
===================================================================
RCS file: /cvs/cairo/cairo/test/mask.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mask.c	6 May 2005 20:23:41 -0000	1.3
+++ mask.c	6 May 2005 20:26:16 -0000	1.4
@@ -80,7 +80,7 @@
 
     cairo_save (cr2);
     cairo_set_source_rgba (cr2, 0, 0, 0, 0); /* transparent */
-    cairo_set_operator (cr2, CAIRO_OPERATOR_SRC);
+    cairo_set_operator (cr2, CAIRO_OPERATOR_SOURCE);
     cairo_paint (cr2);
     cairo_restore (cr2);
 
@@ -212,7 +212,7 @@
 		/* Clear area we are going to be drawing onto */
 		cairo_save (cr2);
 		cairo_set_source_rgba (cr2, 0, 0, 0, 0); /* transparent */
-		cairo_set_operator (cr2, CAIRO_OPERATOR_SRC);
+		cairo_set_operator (cr2, CAIRO_OPERATOR_SOURCE);
 		cairo_rectangle (cr2, x, y, WIDTH, HEIGHT);
 		cairo_fill (cr2);
 		cairo_restore (cr2);