[cairo-commit] cairo/test Makefile.am, 1.42, 1.43 clip-nesting-ref.png, NONE, 1.1 clip-nesting.c, NONE, 1.1 self-copy-ref.png, NONE, 1.1 self-copy.c, NONE, 1.1 source-clip-ref.png, NONE, 1.1 source-clip.c, NONE, 1.1

[Owen Taylor]

Committed by: otaylor

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

Modified Files:
	Makefile.am 
Added Files:
	clip-nesting-ref.png clip-nesting.c self-copy-ref.png 
	self-copy.c source-clip-ref.png source-clip.c 
Log Message:
2005-04-28  Owen Taylor  <otaylor at redhat.com>

        * src/cairo-surface.c src/cairoint.h: Add _cairo_surface_begin/end
        to save and restore the clip state of a surface. Copy and store
        clip regions set on a surface so that we can save and restore them.

        * src/cairo.[ch]: Add a CAIRO_STATUS_BAD_NESTING error
        for interleaved use of two cairo_t's on the same surface. Also,
        add a skeleton doc comment for cairo_status_t.

        * src/cairo.c src/cairo-gstate.c src/cairoint.h: Use
        _cairo_surface_begin/end to replace
        _cairo_gstate_restore_external_state.

        * src/cairo-gstate.c: Use _cairo_surface_begin/end to save the
        state of a surface when we start drawing at it and restore it
        at the end. Check that the save level of the surface is what
        we expect on drawing operations and fail with CAIRO_STATUS_BAD_NESTING
        otherwise.

        * src/cairo-pattern.c src/cairoint.h (_cairo_pattern_acquire_surface_for_surface)
        (_cairo_pattern_release_surface): Surround use of pattern->surface
        with _cairo_surface->begin/end so we don't clip surfaces used as
        sources.

        * test/clip-nesting.c test/Makefile.am: Test of destinatin
        clipping with the nested creation of cairo_t's for the same
        context.

        * test/source-clip.c test/Makefile.am: Test that clipping on
        a source as a destination doesn't affect use of it as a source.

        * test/self-copy.c: XFAIL test for copying from a surface as
        a source to itself as a destination with a clip.


Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/test/Makefile.am,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- Makefile.am	2 May 2005 19:36:20 -0000	1.42
+++ Makefile.am	2 May 2005 20:39:34 -0000	1.43
@@ -1,6 +1,7 @@
 # All test cases go here
 TESTS = 		\
 clip-twice		\
+clip-nesting		\
 coverage		\
 create-for-png		\
 fill-and-stroke		\
@@ -17,7 +18,9 @@
 pdf-surface		\
 pixman-rotate		\
 select-font-no-show-text\
+self-copy		\
 set-source		\
+source-clip		\
 surface-finish-twice	\
 surface-pattern		\
 text-cache-crash	\
@@ -32,6 +35,7 @@
 # I really don't like having to repeat this list. Anyone know a good
 # way to avoid it? Can I use a wildcard here?
 EXTRA_DIST =			\
+clip-nesting-ref.png		\
 create-for-png-ref.png		\
 fill-and-stroke-ref.png		\
 fill-rule-ref.png		\
@@ -43,11 +47,14 @@
 move-to-show-surface-ref.png	\
 coverage-ref.png		\
 clip-twice-ref.png		\
+mask-ref.png			\
 paint-ref.png			\
 path-data-ref.png		\
 pixman-rotate-ref.png		\
 romedalen.png			\
+self-copy-ref.png		\
 set-source-ref.png		\
+source-clip-ref.png		\
 surface-pattern-ref.png		\
 transforms-ref.png		\
 translate-show-surface-ref.png	\
@@ -70,6 +77,7 @@
 XFAIL_TESTS =		\
 coverage		\
 pixman-rotate		\
+self-copy		\
 text-rotate
 
 check_PROGRAMS = $(TESTS)
@@ -99,6 +107,7 @@
 # ARGH! I have to repeat the list of tests a third time. Maybe it's
 # time to break down and auto-generate the Makefile.am or something
 # from autogen.sh. My, but this is painful...
+clip_nesting_LDADD = $(LDADDS)
 clip_twice_LDADD = $(LDADDS)
 coverage_LDADD = $(LDADDS)
 create_for_png_LDADD = $(LDADDS)
@@ -116,7 +125,9 @@
 pdf_surface_LDADD = $(LDADDS)
 pixman_rotate_LDADD = $(LDADDS)
 select_font_no_show_text_LDADD = $(LDADDS)
+self_copy_LDADD = $(LDADDS)
 set_source_LDADD = $(LDADDS)
+source_clip_LDADD = $(LDADDS)
 surface_finish_twice_LDADD = $(LDADDS)
 surface_pattern_LDADD = $(LDADDS)
 text_cache_crash_LDADD = $(LDADDS)

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

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

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

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

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

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