[cairo-commit] cairo/test .cvsignore, 1.45, 1.46 Makefile.am, 1.81, 1.82 nil-surface-ref.png, NONE, 1.1 nil-surface.c, NONE, 1.1

Carl Worth commit at pdx.freedesktop.org
Thu Aug 18 23:10:50 PDT 2005


Committed by: cworth

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

Modified Files:
	.cvsignore Makefile.am 
Added Files:
	nil-surface-ref.png nil-surface.c 
Log Message:

2005-08-18  Carl Worth  <cworth at cworth.org>

        Fix for bug #4088:

        * src/cairo-pattern.c: (_cairo_pattern_nil_for_status):
        New function to return the current nil pattern depending on the
        status.

        * src/cairo-pattern.c: (cairo_pattern_create_for_surface):
        * src/cairo-pattern.c: (_cairo_pattern_init_for_surface): Add
        missing early bailout on surface->status with error propagation to
        the pattern.

        Related cleanups for cairo_pattern_t:

        * src/cairo-pattern.c: (_cairo_gradient_pattern_init_copy): Don't
        check other->status since this is a static function.

        * src/cairo-pattern.c: (_cairo_pattern_init_copy): Add missing
        early bailout on other->status.

        * src/cairo-pattern.c: (_cairo_pattern_fini): Cleanup identifier
        names.

        * src/cairo-pattern.c: (_cairo_pattern_create_solid),
        (cairo_pattern_create_linear), (cairo_pattern_create_radial):
        Track rename of nil patterns.

        * src/cairo-pattern.c: (cairo_pattern_set_matrix),
        (cairo_pattern_set_filter),
        (cairo_pattern_set_extend): Don't call _cairo_error for
        pre-existing errors.

        * src/cairo-pattern.c: (_cairo_pattern_acquire_surface): Take care
        to initialize some fields to that _cairo_pattern_release_surface
        will work even after an error.

        * src/cairoint.h:
        * src/cairo.c: (cairo_get_source): Track rename of
        cairo_solid_pattern_nil to cairo_pattern_nil.

        * test/.cvsignore:
        * test/Makefile.am:
        * test/nil-surface-ref.png:
        * test/nil-surface.c: (draw), (main): New test to ensure that a
        file-not-found error will propagate from a surface, through a
        pattern, and onto a cairo_t.


Index: .cvsignore
===================================================================
RCS file: /cvs/cairo/cairo/test/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- .cvsignore	19 Aug 2005 00:19:54 -0000	1.45
+++ .cvsignore	19 Aug 2005 06:10:42 -0000	1.46
@@ -26,6 +26,7 @@
 mask-ctm
 mask-surface-ctm
 move-to-show-surface
+nil-surface
 operator-clear
 operator-source
 paint

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/test/Makefile.am,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- Makefile.am	18 Aug 2005 23:22:23 -0000	1.81
+++ Makefile.am	19 Aug 2005 06:10:42 -0000	1.82
@@ -21,6 +21,7 @@
 mask-ctm			\
 mask-surface-ctm		\
 move-to-show-surface		\
+nil-surface			\
 operator-clear			\
 operator-source			\
 paint				\
@@ -194,6 +195,7 @@
 mask_ctm_LDADD = $(LDADDS)
 mask_surface_ctm_LDADD = $(LDADDS)
 move_to_show_surface_LDADD = $(LDADDS)
+nil_surface_LDADD = $(LDADDS)
 operator_clear_LDADD = $(LDADDS)
 operator_source_LDADD = $(LDADDS)
 paint_LDADD = $(LDADDS)

--- NEW FILE: nil-surface-ref.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nil-surface.c ---
(This appears to be a binary file; contents omitted.)



More information about the cairo-commit mailing list