[cairo-commit] cairo/test surface-finish-twice.c,1.3,1.4

[Carl Worth]

Committed by: cworth

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

Modified Files:
	surface-finish-twice.c 
Log Message:

        * src/cairo.h: Add CAIRO_STATUS_INVALID_CONTENT,
        CAIRO_STATUS_INVALID_FORMAT, and CAIRO_STATUS_INVALID_VISUAL.

        Change functions to return type of void:

                cairo_scaled_font_extents
                cairo_surface_finish

        Add new functions to query object status:

                cairo_scaled_font_status
                cairo_surface_status

        * doc/public/tmpl/cairo.sgml:
        * src/cairo-array.c:
        * src/cairo-atsui-font.c:
        * src/cairo-font.c:
        * src/cairo-ft-font.c:
        * src/cairo-glitz-surface.c:
        * src/cairo-gstate.c:
        * src/cairo-image-surface.c:
        * src/cairo-meta-surface.c:
        * src/cairo-path-data.c:
        * src/cairo-pattern.c:
        * src/cairo-pdf-surface.c:
        * src/cairo-png.c:
        * src/cairo-ps-surface.c:
        * src/cairo-quartz-surface.c:
        * src/cairo-surface.c:
        * src/cairo-win32-font.c:
        * src/cairo-win32-surface.c:
        * src/cairo-xcb-surface.c:
        * src/cairo-xlib-surface.c:
        * src/cairo.c:
        * src/cairoint.h: Implementation of new error handling scheme for
        cairo_surface_t and cairo_scaled_font_t.

        * test/surface-finish-twice.c: Track change in return value of
        cairo_surface_finish.


Index: surface-finish-twice.c
===================================================================
RCS file: /cvs/cairo/cairo/test/surface-finish-twice.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- surface-finish-twice.c	15 Jul 2005 00:55:59 -0000	1.3
+++ surface-finish-twice.c	27 Jul 2005 22:39:35 -0000	1.4
@@ -55,12 +55,13 @@
     cairo_status_t status;
 
     surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 1, 1);
-    status = cairo_surface_finish (surface);
-    if (status != CAIRO_STATUS_SUCCESS)
+
+    cairo_surface_finish (surface);
+    if (cairo_surface_status (surface) != CAIRO_STATUS_SUCCESS)
 	return CAIRO_TEST_FAILURE;
 
-    status = cairo_surface_finish (surface);
-    if (status != CAIRO_STATUS_SURFACE_FINISHED)
+    cairo_surface_finish (surface);
+    if (cairo_surface_status (surface) != CAIRO_STATUS_SURFACE_FINISHED)
 	return CAIRO_TEST_FAILURE;
 
     cairo_surface_destroy (surface);