Add two new tests: mask-ctm mask-surface-ctm demonstrating that masks are not currently being modified by the CTM.

This commit is contained in:
Carl Worth 2005-07-28 15:55:00 +00:00
parent 5f6c5026e6
commit 26289b3664
7 changed files with 178 additions and 0 deletions

View file

@ -1,3 +1,16 @@
2005-07-28 Carl Worth <cworth@cworth.org>
* test/.cvsignore:
* test/Makefile.am:
* test/mask-ctm-ref.png:
* test/mask-ctm.c: (draw), (main):
* test/mask-surface-ctm-ref.png:
* test/mask-surface-ctm.c: (draw), (main): Add two new tests:
mask-ctm
mask-surface-ctm
demonstrating that masks are not currently being modified by the
CTM.
2005-07-28 Carl Worth <cworth@cworth.org>
* RELEASING: CC gnome-announce-list@gnome.org on cairo release

View file

@ -20,6 +20,8 @@ leaky-polygon
line-width
linear-gradient
mask
mask-ctm
mask-surface-ctm
move-to-show-surface
paint
paint-with-alpha

View file

@ -16,6 +16,8 @@ leaky-polygon \
line-width \
linear-gradient \
mask \
mask-ctm \
mask-surface-ctm \
move-to-show-surface \
paint \
paint-with-alpha \
@ -72,6 +74,8 @@ leaky-polygon-ref.png \
line-width-ref.png \
linear-gradient-ref.png \
mask-ref.png \
mask-ctm-ref.png \
mask-surface-ctm-ref.png \
move-to-show-surface-ref.png \
paint-ref.png \
paint-with-alpha-ref.png \
@ -161,6 +165,8 @@ leaky_polygon_LDADD = $(LDADDS)
line_width_LDADD = $(LDADDS)
linear_gradient_LDADD = $(LDADDS)
mask_LDADD = $(LDADDS)
mask_ctm_LDADD = $(LDADDS)
mask_surface_ctm_LDADD = $(LDADDS)
move_to_show_surface_LDADD = $(LDADDS)
paint_LDADD = $(LDADDS)
paint_with_alpha_LDADD = $(LDADDS)

BIN
test/mask-ctm-ref.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 129 B

82
test/mask-ctm.c Normal file
View file

@ -0,0 +1,82 @@
/*
* Copyright © 2005 Red Hat, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software
* and its documentation for any purpose is hereby granted without
* fee, provided that the above copyright notice appear in all copies
* and that both that copyright notice and this permission notice
* appear in supporting documentation, and that the name of
* Red Hat, Inc. not be used in advertising or publicity pertaining to
* distribution of the software without specific, written prior
* permission. Red Hat, Inc. makes no representations about the
* suitability of this software for any purpose. It is provided "as
* is" without express or implied warranty.
*
* RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
* SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL,
* INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
* RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Carl D. Worth <cworth@cworth.org>
*/
#include "cairo-test.h"
cairo_test_t test = {
"mask-ctm",
"Test that cairo_mask is affected properly by the CTM",
10, 10
};
static cairo_test_status_t
draw (cairo_t *cr, int width, int height)
{
cairo_surface_t *mask_surface;
cairo_pattern_t *mask;
unsigned long data[] = {
0x80000000, 0x80000000,
0x80000000, 0x80000000,
};
cairo_matrix_t matrix;
mask_surface = cairo_image_surface_create_for_data ((unsigned char *) data,
CAIRO_FORMAT_ARGB32, 2, 2, 8);
mask = cairo_pattern_create_for_surface (mask_surface);
cairo_surface_destroy (mask_surface);
cairo_set_source_rgb (cr, 1.0, 0, 0);
/* We can translate with the CTM, with the pattern matrix, or with
* both. */
/* 1. CTM alone. */
cairo_save (cr);
{
cairo_translate (cr, 2, 2);
cairo_mask (cr, mask);
}
cairo_restore (cr);
/* 2. Pattern matrix alone. */
cairo_matrix_init_translate (&matrix, -4, -4);
cairo_pattern_set_matrix (mask, &matrix);
cairo_mask (cr, mask);
/* 3. CTM + pattern matrix */
cairo_translate (cr, 2, 2);
cairo_mask (cr, mask);
cairo_pattern_destroy (mask);
return CAIRO_TEST_SUCCESS;
}
int
main (void)
{
return cairo_test (&test, draw);
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 129 B

75
test/mask-surface-ctm.c Normal file
View file

@ -0,0 +1,75 @@
/*
* Copyright © 2005 Red Hat, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software
* and its documentation for any purpose is hereby granted without
* fee, provided that the above copyright notice appear in all copies
* and that both that copyright notice and this permission notice
* appear in supporting documentation, and that the name of
* Red Hat, Inc. not be used in advertising or publicity pertaining to
* distribution of the software without specific, written prior
* permission. Red Hat, Inc. makes no representations about the
* suitability of this software for any purpose. It is provided "as
* is" without express or implied warranty.
*
* RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
* SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL,
* INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
* RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Carl D. Worth <cworth@cworth.org>
*/
#include "cairo-test.h"
cairo_test_t test = {
"mask-surface-ctm",
"Test that cairo_mask_surface is affected properly by the CTM",
10, 10
};
static cairo_test_status_t
draw (cairo_t *cr, int width, int height)
{
cairo_surface_t *mask;
unsigned long data[] = {
0x80000000, 0x80000000,
0x80000000, 0x80000000,
};
mask = cairo_image_surface_create_for_data ((unsigned char *) data,
CAIRO_FORMAT_ARGB32, 2, 2, 8);
cairo_set_source_rgb (cr, 1.0, 0, 0);
/* We can translate with the CTM, with the mask_surface offset, or
* with both. */
/* 1. CTM alone. */
cairo_save (cr);
{
cairo_translate (cr, 2, 2);
cairo_mask_surface (cr, mask, 0, 0);
}
cairo_restore (cr);
/* 2. Offset alone. */
cairo_mask_surface (cr, mask, 4, 4);
/* 3. CTM + offset */
cairo_translate (cr, 2, 2);
cairo_mask_surface (cr, mask, 4, 4);
cairo_surface_destroy (mask);
return CAIRO_TEST_SUCCESS;
}
int
main (void)
{
return cairo_test (&test, draw);
}