[cairo-commit] cairo/test mask.c, 1.5, 1.6 pixman-rotate.c, 1.9, 1.10 source-clip.c, 1.2, 1.3

[Carl Worth]

Committed by: cworth

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

Modified Files:
	mask.c pixman-rotate.c source-clip.c 
Log Message:

        * src/cairo.h: Give enum tags an underscore prefix to match the
        style of the struct tags. Add new cairo_content_t and change
        cairo_surface_create_similar to accept a cairo_content_t rather
        than a cairo_format_t.

        * src/cairoint.h:
        * src/cairo-glitz-surface.c: (_cairo_glitz_surface_create_similar):
        * src/cairo-image-surface.c: (_cairo_image_surface_create_similar):
        * src/cairo-meta-surface.c: (_cairo_meta_surface_create_similar):
        * src/cairo-pdf-surface.c: (_cairo_pdf_surface_create_similar):
        * src/cairo-ps-surface.c: (_cairo_ps_surface_create_similar):
        * src/cairo-quartz-surface.c: (_cairo_quartz_surface_create_similar):
        * src/cairo-surface.c: (_cairo_surface_create_similar_scratch),
        (cairo_surface_create_similar),
        (_cairo_surface_create_similar_solid):
        * src/cairo-win32-surface.c: (_cairo_win32_surface_create_similar),
        (_cairo_win32_surface_get_subimage):
        * src/cairo-xcb-surface.c: (_cairo_xcb_surface_create_similar),
        (_cairo_xcb_surface_clone_similar):
        * src/cairo-xlib-surface.c: (_cairo_xlib_surface_create_similar),
        (_cairo_xlib_surface_clone_similar): Change surface backend
        create_similar call to accept a cairo_content_t rather than a
        cairo_format_t.

        * src/cairo-glitz-surface.c: (_glitz_format_from_content),
        (_cairo_glitz_surface_clone_similar),
        (_cairo_glitz_pattern_acquire_surface),
        (_cairo_glitz_surface_fill_rectangles),
        (_cairo_glitz_surface_composite_trapezoids):
        * src/cairo-gstate.c: (_cairo_gstate_mask),
        (_composite_traps_intermediate_surface),
        (_cairo_gstate_intersect_clip_mask), (_cairo_gstate_show_glyphs):
        * src/cairo-image-surface.c: (cairo_image_surface_create),
        (cairo_image_surface_create_for_data),
        (_cairo_format_from_content), (_cairo_content_from_format):
        * src/cairo-pattern.c: (_cairo_pattern_acquire_surface_for_solid):
        * src/cairo-ps-surface.c: (emit_image):
        * test/mask.c: (mask_polygon), (draw):
        * test/pixman-rotate.c: (draw):
        * test/source-clip.c: (draw): Fix all calls into create_similar to
        pass a cairo_content_t rather than a cairo_format_t.


Index: mask.c
===================================================================
RCS file: /cvs/cairo/cairo/test/mask.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mask.c	6 May 2005 20:32:53 -0000	1.5
+++ mask.c	8 Jul 2005 17:12:29 -0000	1.6
@@ -74,7 +74,7 @@
     cairo_t *cr2;
 
     mask_surface = cairo_surface_create_similar (cairo_get_target (cr),
-						 CAIRO_FORMAT_A8,
+						 CAIRO_CONTENT_ALPHA,
 						 WIDTH, HEIGHT);
     cr2 = cairo_create (mask_surface);
 
@@ -196,7 +196,7 @@
      * a temporary surface and copy over.
      */
     tmp_surface = cairo_surface_create_similar (cairo_get_target (cr),
-						CAIRO_FORMAT_ARGB32,
+						CAIRO_CONTENT_COLOR_ALPHA,
 						IMAGE_WIDTH, IMAGE_HEIGHT);
     cr2 = cairo_create (tmp_surface);
 

Index: pixman-rotate.c
===================================================================
RCS file: /cvs/cairo/cairo/test/pixman-rotate.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- pixman-rotate.c	6 May 2005 20:23:41 -0000	1.9
+++ pixman-rotate.c	8 Jul 2005 17:12:29 -0000	1.10
@@ -28,7 +28,7 @@
     cairo_t *cr2;
 
     stamp = cairo_surface_create_similar (cairo_get_target (cr),
-					  CAIRO_FORMAT_ARGB32,
+					  CAIRO_CONTENT_COLOR_ALPHA,
 					  WIDTH, HEIGHT);
     cr2 = cairo_create (stamp);
     {

Index: source-clip.c
===================================================================
RCS file: /cvs/cairo/cairo/test/source-clip.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- source-clip.c	6 May 2005 20:23:41 -0000	1.2
+++ source-clip.c	8 Jul 2005 17:12:29 -0000	1.3
@@ -43,7 +43,7 @@
     cairo_t *cr2;
 
     source_surface = cairo_surface_create_similar (cairo_get_target (cr),
-						   CAIRO_FORMAT_ARGB32,
+						   CAIRO_CONTENT_COLOR_ALPHA,
 						   SIZE, SIZE);
 
     cr2 = cairo_create (source_surface);