[cairo-commit] 2 commits - src/cairo-surface-wrapper.c test/Makefile.sources test/record1414x.c test/record2x.c test/reference

Chris Wilson ickle at kemper.freedesktop.org
Mon Feb 27 06:50:19 PST 2012


 src/cairo-surface-wrapper.c                                      |   12 
 test/Makefile.sources                                            |    2 
 test/record1414x.c                                               |  497 ++++++++++
 test/record2x.c                                                  |  493 +++++++++
 test/reference/record1414x-fill-alpha.argb32.ref.png             |binary
 test/reference/record1414x-fill-alpha.rgb24.ref.png              |binary
 test/reference/record1414x-paint-alpha-clip-mask.argb32.ref.png  |binary
 test/reference/record1414x-paint-alpha-clip-mask.rgb24.ref.png   |binary
 test/reference/record1414x-paint-alpha-clip.argb32.ref.png       |binary
 test/reference/record1414x-paint-alpha-clip.rgb24.ref.png        |binary
 test/reference/record1414x-paint-alpha-solid-clip.argb32.ref.png |binary
 test/reference/record1414x-paint-alpha-solid-clip.rgb24.ref.png  |binary
 test/reference/record1414x-paint-alpha.argb32.ref.png            |binary
 test/reference/record1414x-paint-alpha.rgb24.ref.png             |binary
 test/reference/record1414x-paint.argb32.ref.png                  |binary
 test/reference/record1414x-paint.rgb24.ref.png                   |binary
 test/reference/record1414x-select-font-face.argb32.ref.png       |binary
 test/reference/record1414x-select-font-face.rgb24.ref.png        |binary
 test/reference/record1414x-self-intersecting.argb32.ref.png      |binary
 test/reference/record1414x-self-intersecting.rgb24.ref.png       |binary
 test/reference/record1414x-text-transform.argb32.ref.png         |binary
 test/reference/record1414x-text-transform.rgb24.ref.png          |binary
 test/reference/record2x-fill-alpha.argb32.ref.png                |binary
 test/reference/record2x-fill-alpha.rgb24.ref.png                 |binary
 test/reference/record2x-paint-alpha-clip-mask.argb32.ref.png     |binary
 test/reference/record2x-paint-alpha-clip-mask.rgb24.ref.png      |binary
 test/reference/record2x-paint-alpha-clip.argb32.ref.png          |binary
 test/reference/record2x-paint-alpha-clip.rgb24.ref.png           |binary
 test/reference/record2x-paint-alpha-solid-clip.argb32.ref.png    |binary
 test/reference/record2x-paint-alpha-solid-clip.rgb24.ref.png     |binary
 test/reference/record2x-paint-alpha.argb32.ref.png               |binary
 test/reference/record2x-paint-alpha.rgb24.ref.png                |binary
 test/reference/record2x-paint.argb32.ref.png                     |binary
 test/reference/record2x-paint.rgb24.ref.png                      |binary
 test/reference/record2x-select-font-face.argb32.ref.png          |binary
 test/reference/record2x-select-font-face.rgb24.ref.png           |binary
 test/reference/record2x-self-intersecting.argb32.ref.png         |binary
 test/reference/record2x-self-intersecting.rgb24.ref.png          |binary
 test/reference/record2x-text-transform.argb32.ref.png            |binary
 test/reference/record2x-text-transform.rgb24.ref.png             |binary
 40 files changed, 1003 insertions(+), 1 deletion(-)

New commits:
commit b1b5e9b9087ff3e0679f850b36314ca38986a11d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Feb 27 14:25:39 2012 +0000

    surface-wrapper: Apply replay transforms to scaled font
    
    Improves: record2x-select-font-face, record2x-text-transform
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-surface-wrapper.c b/src/cairo-surface-wrapper.c
index a1940a5..b4dd64e 100644
--- a/src/cairo-surface-wrapper.c
+++ b/src/cairo-surface-wrapper.c
@@ -416,6 +416,7 @@ _cairo_surface_wrapper_show_text_glyphs (cairo_surface_wrapper_t *wrapper,
     cairo_clip_t *dev_clip;
     cairo_glyph_t stack_glyphs [CAIRO_STACK_ARRAY_LENGTH(cairo_glyph_t)];
     cairo_glyph_t *dev_glyphs = stack_glyphs;
+    cairo_scaled_font_t *dev_scaled_font = scaled_font;
     cairo_pattern_union_t source_copy;
 
     if (unlikely (wrapper->target->status))
@@ -431,6 +432,13 @@ _cairo_surface_wrapper_show_text_glyphs (cairo_surface_wrapper_t *wrapper,
 
 	_cairo_surface_wrapper_get_transform (wrapper, &m);
 
+	if (! _cairo_matrix_is_translation (&m)) {
+	    dev_scaled_font = cairo_scaled_font_create (scaled_font->font_face,
+							&scaled_font->font_matrix,
+							&m,
+							&scaled_font->options);
+	}
+
 	if (num_glyphs > ARRAY_LENGTH (stack_glyphs)) {
 	    dev_glyphs = _cairo_malloc_ab (num_glyphs, sizeof (cairo_glyph_t));
 	    if (unlikely (dev_glyphs == NULL)) {
@@ -472,12 +480,14 @@ _cairo_surface_wrapper_show_text_glyphs (cairo_surface_wrapper_t *wrapper,
 					      dev_glyphs, num_glyphs,
 					      clusters, num_clusters,
 					      cluster_flags,
-					      scaled_font,
+					      dev_scaled_font,
 					      dev_clip);
  FINISH:
     _cairo_clip_destroy (dev_clip);
     if (dev_glyphs != stack_glyphs)
 	free (dev_glyphs);
+    if (dev_scaled_font != scaled_font)
+	cairo_scaled_font_destroy (dev_scaled_font);
     return status;
 }
 
commit 78aeb0d14c7941964c232f4fc199d6d277835a79
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Feb 27 14:46:02 2012 +0000

    test: Verify scaled replay of a recording surface
    
    After this works, we may also like to check simple rotations and an
    affine transform.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/test/Makefile.sources b/test/Makefile.sources
index b560d91..7f2cd1e 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -254,6 +254,8 @@ test_sources = \
 	random-intersections-curves-nz.c		\
 	raster-source.c					\
 	record.c					\
+	record1414x.c					\
+	record2x.c					\
 	record-extend.c					\
 	record-mesh.c					\
 	recording-surface-pattern.c			\
diff --git a/test/record1414x.c b/test/record1414x.c
new file mode 100644
index 0000000..d1bce88
--- /dev/null
+++ b/test/record1414x.c
@@ -0,0 +1,497 @@
+/*
+ * Copyright © 2005 Red Hat, Inc.
+ * Copyright © 2011 Intel Corporation
+ *
+ * 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.
+ *
+ * Authors:
+ *	Carl D. Worth <cworth at cworth.org>
+ *	Chris Wilson <chris at chris-wilson.co.uk>
+ */
+
+#include "cairo-test.h"
+
+#ifndef M_SQRT2
+#define M_SQRT2 1.41421345623730951
+#endif
+
+#define TEXT_SIZE 12
+#define SIZE 60 /* needs to be big to check large area effects (dithering) */
+#define PAD 2
+
+#define TT_SIZE 100
+#define TT_PAD 5
+#define TT_FONT_SIZE 32.0
+
+#define GENERATE_REF 0
+
+static uint32_t data[16] = {
+    0xffffffff, 0xffffffff,		0xffff0000, 0xffff0000,
+    0xffffffff, 0xffffffff,		0xffff0000, 0xffff0000,
+
+    0xff00ff00, 0xff00ff00,		0xff0000ff, 0xff0000ff,
+    0xff00ff00, 0xff00ff00,		0xff0000ff, 0xff0000ff
+};
+
+static const char *png_filename = "romedalen.png";
+
+static cairo_t *
+paint (cairo_t *cr)
+{
+    cairo_set_source_rgb (cr, 0, 0, 1);
+    cairo_paint (cr);
+
+    cairo_translate (cr, 2, 2);
+    cairo_scale (cr, 0.5, 0.5);
+
+    cairo_set_source_rgb (cr, 1, 0, 0);
+    cairo_paint (cr);
+
+    return cr;
+}
+
+static cairo_t *
+paint_alpha (cairo_t *cr)
+{
+    cairo_surface_t *surface;
+
+    surface = cairo_image_surface_create_for_data ((unsigned char *) data,
+						   CAIRO_FORMAT_RGB24, 4, 4, 16);
+
+    cairo_test_paint_checkered (cr);
+
+    cairo_scale (cr, 4, 4);
+
+    cairo_set_source_surface (cr, surface, 2 , 2);
+    cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_NEAREST);
+    cairo_paint_with_alpha (cr, 0.5);
+
+    cairo_surface_finish (surface); /* data will go out of scope */
+    cairo_surface_destroy (surface);
+
+    return cr;
+}
+
+static cairo_t *
+paint_alpha_solid_clip (cairo_t *cr)
+{
+    cairo_test_paint_checkered (cr);
+
+    cairo_rectangle (cr, 2.5, 2.5, 27, 27);
+    cairo_clip (cr);
+
+    cairo_set_source_rgb (cr, 1., 0.,0.);
+    cairo_paint_with_alpha (cr, 0.5);
+
+    return cr;
+}
+
+static cairo_t *
+paint_alpha_clip (cairo_t *cr)
+{
+    cairo_surface_t *surface;
+
+    surface = cairo_image_surface_create_for_data ((unsigned char *) data,
+						   CAIRO_FORMAT_RGB24, 4, 4, 16);
+
+    cairo_test_paint_checkered (cr);
+
+    cairo_rectangle (cr, 10.5, 10.5, 11, 11);
+    cairo_clip (cr);
+
+    cairo_scale (cr, 4, 4);
+
+    cairo_set_source_surface (cr, surface, 2 , 2);
+    cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_NEAREST);
+    cairo_paint_with_alpha (cr, 0.5);
+
+    cairo_surface_finish (surface); /* data will go out of scope */
+    cairo_surface_destroy (surface);
+
+    return cr;
+}
+
+static cairo_t *
+paint_alpha_clip_mask (cairo_t *cr)
+{
+    cairo_surface_t *surface;
+
+    surface = cairo_image_surface_create_for_data ((unsigned char *) data,
+						   CAIRO_FORMAT_RGB24, 4, 4, 16);
+
+    cairo_test_paint_checkered (cr);
+
+    cairo_move_to (cr, 16, 5);
+    cairo_line_to (cr, 5, 16);
+    cairo_line_to (cr, 16, 27);
+    cairo_line_to (cr, 27, 16);
+    cairo_clip (cr);
+
+    cairo_scale (cr, 4, 4);
+
+    cairo_set_source_surface (cr, surface, 2 , 2);
+    cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_NEAREST);
+    cairo_paint_with_alpha (cr, 0.5);
+
+    cairo_surface_finish (surface); /* data will go out of scope */
+    cairo_surface_destroy (surface);
+
+    return cr;
+}
+
+static cairo_t *
+select_font_face (cairo_t *cr)
+{
+    /* We draw in the default black, so paint white first. */
+    cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); /* white */
+    cairo_paint (cr);
+
+    cairo_set_source_rgb (cr, 0, 0, 0); /* black */
+
+    cairo_set_font_size (cr, TEXT_SIZE);
+    cairo_move_to (cr, 0, TEXT_SIZE);
+
+    cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Serif",
+			    CAIRO_FONT_SLANT_NORMAL,
+			    CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_show_text (cr, "i-am-serif");
+
+    cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
+			    CAIRO_FONT_SLANT_NORMAL,
+			    CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_show_text (cr, " i-am-sans");
+
+    cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans Mono",
+			    CAIRO_FONT_SLANT_NORMAL,
+			    CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_show_text (cr, " i-am-mono");
+
+    return cr;
+}
+
+static cairo_t *
+fill_alpha (cairo_t *cr)
+{
+    const double alpha = 1./3;
+    int n;
+
+    /* flatten to white */
+    cairo_set_source_rgb (cr, 1, 1, 1);
+    cairo_paint (cr);
+
+    /* square */
+    cairo_rectangle (cr, PAD, PAD, SIZE, SIZE);
+    cairo_set_source_rgba (cr, 1, 0, 0, alpha);
+    cairo_fill (cr);
+
+    /* circle */
+    cairo_translate (cr, SIZE + 2 * PAD, 0);
+    cairo_arc (cr, PAD + SIZE / 2., PAD + SIZE / 2., SIZE / 2., 0, 2 * M_PI);
+    cairo_set_source_rgba (cr, 0, 1, 0, alpha);
+    cairo_fill (cr);
+
+    /* triangle */
+    cairo_translate (cr, 0, SIZE + 2 * PAD);
+    cairo_move_to (cr, PAD + SIZE / 2, PAD);
+    cairo_line_to (cr, PAD + SIZE, PAD + SIZE);
+    cairo_line_to (cr, PAD, PAD + SIZE);
+    cairo_set_source_rgba (cr, 0, 0, 1, alpha);
+    cairo_fill (cr);
+
+    /* star */
+    cairo_translate (cr, -(SIZE + 2 * PAD) + SIZE/2., SIZE/2.);
+    for (n = 0; n < 5; n++) {
+	cairo_line_to (cr,
+		       SIZE/2 * cos (2*n * 2*M_PI / 10),
+		       SIZE/2 * sin (2*n * 2*M_PI / 10));
+
+	cairo_line_to (cr,
+		       SIZE/4 * cos ((2*n+1)*2*M_PI / 10),
+		       SIZE/4 * sin ((2*n+1)*2*M_PI / 10));
+    }
+    cairo_set_source_rgba (cr, 0, 0, 0, alpha);
+    cairo_fill (cr);
+
+    return cr;
+}
+
+static cairo_t *
+self_intersecting (cairo_t *cr)
+{
+    cairo_set_source_rgb (cr, 1, 1, 1);
+    cairo_paint (cr);
+
+    cairo_translate (cr, 1.0, 1.0);
+
+    cairo_set_source_rgb (cr, 1, 0, 0); /* red */
+
+    /* First draw the desired shape with a fill */
+    cairo_rectangle (cr, 0.5, 0.5,  4.0, 4.0);
+    cairo_rectangle (cr, 3.5, 3.5,  4.0, 4.0);
+    cairo_rectangle (cr, 3.5, 1.5, -2.0, 2.0);
+    cairo_rectangle (cr, 6.5, 4.5, -2.0, 2.0);
+
+    cairo_fill (cr);
+
+    /* Then try the same thing with a stroke */
+    cairo_translate (cr, 0, 10);
+    cairo_move_to (cr, 1.0, 1.0);
+    cairo_rel_line_to (cr,  3.0,  0.0);
+    cairo_rel_line_to (cr,  0.0,  6.0);
+    cairo_rel_line_to (cr,  3.0,  0.0);
+    cairo_rel_line_to (cr,  0.0, -3.0);
+    cairo_rel_line_to (cr, -6.0,  0.0);
+    cairo_close_path (cr);
+
+    cairo_set_line_width (cr, 1.0);
+    cairo_stroke (cr);
+
+    return cr;
+}
+
+static void
+draw_text_transform (cairo_t *cr)
+{
+    cairo_matrix_t tm;
+
+    /* skew */
+    cairo_matrix_init (&tm, 1, 0,
+                       -0.25, 1,
+                       0, 0);
+    cairo_matrix_scale (&tm, TT_FONT_SIZE, TT_FONT_SIZE);
+    cairo_set_font_matrix (cr, &tm);
+
+    cairo_new_path (cr);
+    cairo_move_to (cr, 50, TT_SIZE-TT_PAD);
+    cairo_show_text (cr, "A");
+
+    /* rotate and scale */
+    cairo_matrix_init_rotate (&tm, M_PI / 2);
+    cairo_matrix_scale (&tm, TT_FONT_SIZE, TT_FONT_SIZE * 2.0);
+    cairo_set_font_matrix (cr, &tm);
+
+    cairo_new_path (cr);
+    cairo_move_to (cr, TT_PAD, TT_PAD + 25);
+    cairo_show_text (cr, "A");
+
+    cairo_matrix_init_rotate (&tm, M_PI / 2);
+    cairo_matrix_scale (&tm, TT_FONT_SIZE * 2.0, TT_FONT_SIZE);
+    cairo_set_font_matrix (cr, &tm);
+
+    cairo_new_path (cr);
+    cairo_move_to (cr, TT_PAD, TT_PAD + 50);
+    cairo_show_text (cr, "A");
+}
+
+static cairo_t *
+text_transform (cairo_t *cr)
+{
+    const cairo_test_context_t *ctx = cairo_test_get_context (cr);
+    cairo_pattern_t *pattern;
+
+    cairo_set_source_rgb (cr, 1., 1., 1.);
+    cairo_paint (cr);
+
+    cairo_set_source_rgb (cr, 0., 0., 0.);
+
+    cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
+			    CAIRO_FONT_SLANT_NORMAL,
+			    CAIRO_FONT_WEIGHT_NORMAL);
+
+    draw_text_transform (cr);
+
+    cairo_translate (cr, SIZE, SIZE);
+    cairo_rotate (cr, M_PI);
+
+    pattern = cairo_test_create_pattern_from_png (ctx, png_filename);
+    cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+    cairo_set_source (cr, pattern);
+    cairo_pattern_destroy (pattern);
+
+    draw_text_transform (cr);
+
+    return cr;
+}
+
+/* And here begins the recording and replaying... */
+
+static cairo_t *
+record_create (cairo_t *target)
+{
+    cairo_surface_t *surface;
+    cairo_t *cr;
+
+    surface = cairo_recording_surface_create (cairo_surface_get_content (cairo_get_target (target)), NULL);
+    cr = cairo_create (surface);
+    cairo_surface_destroy (surface);
+
+    return cr;
+}
+
+static cairo_surface_t *
+record_get (cairo_t *target)
+{
+    cairo_surface_t *surface;
+
+    surface = cairo_surface_reference (cairo_get_target (target));
+    cairo_destroy (target);
+
+    return surface;
+}
+
+static cairo_test_status_t
+record_replay (cairo_t *cr, cairo_t *(*func)(cairo_t *), int width, int height)
+{
+    cairo_surface_t *surface;
+    int x, y;
+
+#if GENERATE_REF
+    cairo_scale (cr, M_SQRT2, M_SQRT2);
+    func (cr);
+#else
+    surface = record_get (func (record_create (cr)));
+
+    cairo_scale (cr, M_SQRT2, M_SQRT2);
+    cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+    cairo_set_source_surface (cr, surface, 0, 0);
+    cairo_surface_destroy (surface);
+    cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_NONE);
+
+    for (y = 0; y < height; y += 2) {
+	for (x = 0; x < width; x += 2) {
+	    cairo_rectangle (cr, x, y, 2, 2);
+	    cairo_clip (cr);
+	    cairo_paint (cr);
+	    cairo_reset_clip (cr);
+	}
+    }
+#endif
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+static cairo_test_status_t
+record_paint (cairo_t *cr, int width, int height)
+{
+    return record_replay (cr, paint, width, height);
+}
+
+static cairo_test_status_t
+record_paint_alpha (cairo_t *cr, int width, int height)
+{
+    return record_replay (cr, paint_alpha, width, height);
+}
+
+static cairo_test_status_t
+record_paint_alpha_solid_clip (cairo_t *cr, int width, int height)
+{
+    return record_replay (cr, paint_alpha_solid_clip, width, height);
+}
+
+static cairo_test_status_t
+record_paint_alpha_clip (cairo_t *cr, int width, int height)
+{
+    return record_replay (cr, paint_alpha_clip, width, height);
+}
+
+static cairo_test_status_t
+record_paint_alpha_clip_mask (cairo_t *cr, int width, int height)
+{
+    return record_replay (cr, paint_alpha_clip_mask, width, height);
+}
+
+static cairo_test_status_t
+record_fill_alpha (cairo_t *cr, int width, int height)
+{
+    return record_replay (cr, fill_alpha, width, height);
+}
+
+static cairo_test_status_t
+record_self_intersecting (cairo_t *cr, int width, int height)
+{
+    return record_replay (cr, self_intersecting, width, height);
+}
+
+static cairo_test_status_t
+record_select_font_face (cairo_t *cr, int width, int height)
+{
+    return record_replay (cr, select_font_face, width, height);
+}
+
+static cairo_test_status_t
+record_text_transform (cairo_t *cr, int width, int height)
+{
+    return record_replay (cr, text_transform, width, height);
+}
+
+CAIRO_TEST (record1414x_paint,
+	    "Test replayed calls to cairo_paint",
+	    "paint,record", /* keywords */
+	    NULL, /* requirements */
+	    M_SQRT2*8, M_SQRT2*8,
+	    NULL, record_paint)
+CAIRO_TEST (record1414x_paint_alpha,
+	    "Simple test of cairo_paint_with_alpha",
+	    "record, paint, alpha", /* keywords */
+	    NULL, /* requirements */
+	    M_SQRT2*32, M_SQRT2*32,
+	    NULL, record_paint_alpha)
+CAIRO_TEST (record1414x_paint_alpha_solid_clip,
+	    "Simple test of cairo_paint_with_alpha+unaligned clip",
+	    "record, paint, alpha, clip", /* keywords */
+	    NULL, /* requirements */
+	    M_SQRT2*32, M_SQRT2*32,
+	    NULL, record_paint_alpha_solid_clip)
+CAIRO_TEST (record1414x_paint_alpha_clip,
+	    "Simple test of cairo_paint_with_alpha+unaligned clip",
+	    "record, paint, alpha, clip", /* keywords */
+	    NULL, /* requirements */
+	    M_SQRT2*32, M_SQRT2*32,
+	    NULL, record_paint_alpha_clip)
+CAIRO_TEST (record1414x_paint_alpha_clip_mask,
+	    "Simple test of cairo_paint_with_alpha+triangular clip",
+	    "record, paint, alpha, clip", /* keywords */
+	    NULL, /* requirements */
+	    M_SQRT2*32, M_SQRT2*32,
+	    NULL, record_paint_alpha_clip_mask)
+CAIRO_TEST (record1414x_fill_alpha,
+	    "Tests using set_rgba();fill()",
+	    "record,fill, alpha", /* keywords */
+	    NULL, /* requirements */
+	    M_SQRT2*(2*SIZE + 4*PAD), M_SQRT2*(2*SIZE + 4*PAD),
+	    NULL, record_fill_alpha)
+CAIRO_TEST (record1414x_select_font_face,
+	    "Tests using cairo_select_font_face to draw text in different faces",
+	    "record, font", /* keywords */
+	    NULL, /* requirements */
+	    M_SQRT2*192, M_SQRT2*(TEXT_SIZE + 4),
+	    NULL, record_select_font_face)
+CAIRO_TEST (record1414x_self_intersecting,
+	    "Test strokes of self-intersecting paths",
+	    "record, stroke, trap", /* keywords */
+	    NULL, /* requirements */
+	    M_SQRT2*10, M_SQRT2*20,
+	    NULL, record_self_intersecting)
+CAIRO_TEST (record1414x_text_transform,
+	    "Test various applications of the font matrix",
+	    "record, text, transform", /* keywords */
+	    NULL, /* requirements */
+	    M_SQRT2*TT_SIZE, M_SQRT2*TT_SIZE,
+	    NULL, record_text_transform)
diff --git a/test/record2x.c b/test/record2x.c
new file mode 100644
index 0000000..351c3bb
--- /dev/null
+++ b/test/record2x.c
@@ -0,0 +1,493 @@
+/*
+ * Copyright © 2005 Red Hat, Inc.
+ * Copyright © 2011 Intel Corporation
+ *
+ * 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.
+ *
+ * Authors:
+ *	Carl D. Worth <cworth at cworth.org>
+ *	Chris Wilson <chris at chris-wilson.co.uk>
+ */
+
+#include "cairo-test.h"
+
+#define TEXT_SIZE 12
+#define SIZE 60 /* needs to be big to check large area effects (dithering) */
+#define PAD 2
+
+#define TT_SIZE 100
+#define TT_PAD 5
+#define TT_FONT_SIZE 32.0
+
+#define GENERATE_REF 0
+
+static uint32_t data[16] = {
+    0xffffffff, 0xffffffff,		0xffff0000, 0xffff0000,
+    0xffffffff, 0xffffffff,		0xffff0000, 0xffff0000,
+
+    0xff00ff00, 0xff00ff00,		0xff0000ff, 0xff0000ff,
+    0xff00ff00, 0xff00ff00,		0xff0000ff, 0xff0000ff
+};
+
+static const char *png_filename = "romedalen.png";
+
+static cairo_t *
+paint (cairo_t *cr)
+{
+    cairo_set_source_rgb (cr, 0, 0, 1);
+    cairo_paint (cr);
+
+    cairo_translate (cr, 2, 2);
+    cairo_scale (cr, 0.5, 0.5);
+
+    cairo_set_source_rgb (cr, 1, 0, 0);
+    cairo_paint (cr);
+
+    return cr;
+}
+
+static cairo_t *
+paint_alpha (cairo_t *cr)
+{
+    cairo_surface_t *surface;
+
+    surface = cairo_image_surface_create_for_data ((unsigned char *) data,
+						   CAIRO_FORMAT_RGB24, 4, 4, 16);
+
+    cairo_test_paint_checkered (cr);
+
+    cairo_scale (cr, 4, 4);
+
+    cairo_set_source_surface (cr, surface, 2 , 2);
+    cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_NEAREST);
+    cairo_paint_with_alpha (cr, 0.5);
+
+    cairo_surface_finish (surface); /* data will go out of scope */
+    cairo_surface_destroy (surface);
+
+    return cr;
+}
+
+static cairo_t *
+paint_alpha_solid_clip (cairo_t *cr)
+{
+    cairo_test_paint_checkered (cr);
+
+    cairo_rectangle (cr, 2.5, 2.5, 27, 27);
+    cairo_clip (cr);
+
+    cairo_set_source_rgb (cr, 1., 0.,0.);
+    cairo_paint_with_alpha (cr, 0.5);
+
+    return cr;
+}
+
+static cairo_t *
+paint_alpha_clip (cairo_t *cr)
+{
+    cairo_surface_t *surface;
+
+    surface = cairo_image_surface_create_for_data ((unsigned char *) data,
+						   CAIRO_FORMAT_RGB24, 4, 4, 16);
+
+    cairo_test_paint_checkered (cr);
+
+    cairo_rectangle (cr, 10.5, 10.5, 11, 11);
+    cairo_clip (cr);
+
+    cairo_scale (cr, 4, 4);
+
+    cairo_set_source_surface (cr, surface, 2 , 2);
+    cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_NEAREST);
+    cairo_paint_with_alpha (cr, 0.5);
+
+    cairo_surface_finish (surface); /* data will go out of scope */
+    cairo_surface_destroy (surface);
+
+    return cr;
+}
+
+static cairo_t *
+paint_alpha_clip_mask (cairo_t *cr)
+{
+    cairo_surface_t *surface;
+
+    surface = cairo_image_surface_create_for_data ((unsigned char *) data,
+						   CAIRO_FORMAT_RGB24, 4, 4, 16);
+
+    cairo_test_paint_checkered (cr);
+
+    cairo_move_to (cr, 16, 5);
+    cairo_line_to (cr, 5, 16);
+    cairo_line_to (cr, 16, 27);
+    cairo_line_to (cr, 27, 16);
+    cairo_clip (cr);
+
+    cairo_scale (cr, 4, 4);
+
+    cairo_set_source_surface (cr, surface, 2 , 2);
+    cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_NEAREST);
+    cairo_paint_with_alpha (cr, 0.5);
+
+    cairo_surface_finish (surface); /* data will go out of scope */
+    cairo_surface_destroy (surface);
+
+    return cr;
+}
+
+static cairo_t *
+select_font_face (cairo_t *cr)
+{
+    /* We draw in the default black, so paint white first. */
+    cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); /* white */
+    cairo_paint (cr);
+
+    cairo_set_source_rgb (cr, 0, 0, 0); /* black */
+
+    cairo_set_font_size (cr, TEXT_SIZE);
+    cairo_move_to (cr, 0, TEXT_SIZE);
+
+    cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Serif",
+			    CAIRO_FONT_SLANT_NORMAL,
+			    CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_show_text (cr, "i-am-serif");
+
+    cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
+			    CAIRO_FONT_SLANT_NORMAL,
+			    CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_show_text (cr, " i-am-sans");
+
+    cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans Mono",
+			    CAIRO_FONT_SLANT_NORMAL,
+			    CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_show_text (cr, " i-am-mono");
+
+    return cr;
+}
+
+static cairo_t *
+fill_alpha (cairo_t *cr)
+{
+    const double alpha = 1./3;
+    int n;
+
+    /* flatten to white */
+    cairo_set_source_rgb (cr, 1, 1, 1);
+    cairo_paint (cr);
+
+    /* square */
+    cairo_rectangle (cr, PAD, PAD, SIZE, SIZE);
+    cairo_set_source_rgba (cr, 1, 0, 0, alpha);
+    cairo_fill (cr);
+
+    /* circle */
+    cairo_translate (cr, SIZE + 2 * PAD, 0);
+    cairo_arc (cr, PAD + SIZE / 2., PAD + SIZE / 2., SIZE / 2., 0, 2 * M_PI);
+    cairo_set_source_rgba (cr, 0, 1, 0, alpha);
+    cairo_fill (cr);
+
+    /* triangle */
+    cairo_translate (cr, 0, SIZE + 2 * PAD);
+    cairo_move_to (cr, PAD + SIZE / 2, PAD);
+    cairo_line_to (cr, PAD + SIZE, PAD + SIZE);
+    cairo_line_to (cr, PAD, PAD + SIZE);
+    cairo_set_source_rgba (cr, 0, 0, 1, alpha);
+    cairo_fill (cr);
+
+    /* star */
+    cairo_translate (cr, -(SIZE + 2 * PAD) + SIZE/2., SIZE/2.);
+    for (n = 0; n < 5; n++) {
+	cairo_line_to (cr,
+		       SIZE/2 * cos (2*n * 2*M_PI / 10),
+		       SIZE/2 * sin (2*n * 2*M_PI / 10));
+
+	cairo_line_to (cr,
+		       SIZE/4 * cos ((2*n+1)*2*M_PI / 10),
+		       SIZE/4 * sin ((2*n+1)*2*M_PI / 10));
+    }
+    cairo_set_source_rgba (cr, 0, 0, 0, alpha);
+    cairo_fill (cr);
+
+    return cr;
+}
+
+static cairo_t *
+self_intersecting (cairo_t *cr)
+{
+    cairo_set_source_rgb (cr, 1, 1, 1);
+    cairo_paint (cr);
+
+    cairo_translate (cr, 1.0, 1.0);
+
+    cairo_set_source_rgb (cr, 1, 0, 0); /* red */
+
+    /* First draw the desired shape with a fill */
+    cairo_rectangle (cr, 0.5, 0.5,  4.0, 4.0);
+    cairo_rectangle (cr, 3.5, 3.5,  4.0, 4.0);
+    cairo_rectangle (cr, 3.5, 1.5, -2.0, 2.0);
+    cairo_rectangle (cr, 6.5, 4.5, -2.0, 2.0);
+
+    cairo_fill (cr);
+
+    /* Then try the same thing with a stroke */
+    cairo_translate (cr, 0, 10);
+    cairo_move_to (cr, 1.0, 1.0);
+    cairo_rel_line_to (cr,  3.0,  0.0);
+    cairo_rel_line_to (cr,  0.0,  6.0);
+    cairo_rel_line_to (cr,  3.0,  0.0);
+    cairo_rel_line_to (cr,  0.0, -3.0);
+    cairo_rel_line_to (cr, -6.0,  0.0);
+    cairo_close_path (cr);
+
+    cairo_set_line_width (cr, 1.0);
+    cairo_stroke (cr);
+
+    return cr;
+}
+
+static void
+draw_text_transform (cairo_t *cr)
+{
+    cairo_matrix_t tm;
+
+    /* skew */
+    cairo_matrix_init (&tm, 1, 0,
+                       -0.25, 1,
+                       0, 0);
+    cairo_matrix_scale (&tm, TT_FONT_SIZE, TT_FONT_SIZE);
+    cairo_set_font_matrix (cr, &tm);
+
+    cairo_new_path (cr);
+    cairo_move_to (cr, 50, TT_SIZE-TT_PAD);
+    cairo_show_text (cr, "A");
+
+    /* rotate and scale */
+    cairo_matrix_init_rotate (&tm, M_PI / 2);
+    cairo_matrix_scale (&tm, TT_FONT_SIZE, TT_FONT_SIZE * 2.0);
+    cairo_set_font_matrix (cr, &tm);
+
+    cairo_new_path (cr);
+    cairo_move_to (cr, TT_PAD, TT_PAD + 25);
+    cairo_show_text (cr, "A");
+
+    cairo_matrix_init_rotate (&tm, M_PI / 2);
+    cairo_matrix_scale (&tm, TT_FONT_SIZE * 2.0, TT_FONT_SIZE);
+    cairo_set_font_matrix (cr, &tm);
+
+    cairo_new_path (cr);
+    cairo_move_to (cr, TT_PAD, TT_PAD + 50);
+    cairo_show_text (cr, "A");
+}
+
+static cairo_t *
+text_transform (cairo_t *cr)
+{
+    const cairo_test_context_t *ctx = cairo_test_get_context (cr);
+    cairo_pattern_t *pattern;
+
+    cairo_set_source_rgb (cr, 1., 1., 1.);
+    cairo_paint (cr);
+
+    cairo_set_source_rgb (cr, 0., 0., 0.);
+
+    cairo_select_font_face (cr, CAIRO_TEST_FONT_FAMILY " Sans",
+			    CAIRO_FONT_SLANT_NORMAL,
+			    CAIRO_FONT_WEIGHT_NORMAL);
+
+    draw_text_transform (cr);
+
+    cairo_translate (cr, SIZE, SIZE);
+    cairo_rotate (cr, M_PI);
+
+    pattern = cairo_test_create_pattern_from_png (ctx, png_filename);
+    cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+    cairo_set_source (cr, pattern);
+    cairo_pattern_destroy (pattern);
+
+    draw_text_transform (cr);
+
+    return cr;
+}
+
+/* And here begins the recording and replaying... */
+
+static cairo_t *
+record_create (cairo_t *target)
+{
+    cairo_surface_t *surface;
+    cairo_t *cr;
+
+    surface = cairo_recording_surface_create (cairo_surface_get_content (cairo_get_target (target)), NULL);
+    cr = cairo_create (surface);
+    cairo_surface_destroy (surface);
+
+    return cr;
+}
+
+static cairo_surface_t *
+record_get (cairo_t *target)
+{
+    cairo_surface_t *surface;
+
+    surface = cairo_surface_reference (cairo_get_target (target));
+    cairo_destroy (target);
+
+    return surface;
+}
+
+static cairo_test_status_t
+record_replay (cairo_t *cr, cairo_t *(*func)(cairo_t *), int width, int height)
+{
+    cairo_surface_t *surface;
+    int x, y;
+
+#if GENERATE_REF
+    cairo_scale (cr, 2, 2);
+    func(cr);
+#else
+    surface = record_get (func (record_create (cr)));
+
+    cairo_scale (cr, 2, 2);
+    cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+    cairo_set_source_surface (cr, surface, 0, 0);
+    cairo_surface_destroy (surface);
+    cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_NONE);
+
+    for (y = 0; y < height; y += 2) {
+	for (x = 0; x < width; x += 2) {
+	    cairo_rectangle (cr, x, y, 2, 2);
+	    cairo_clip (cr);
+	    cairo_paint (cr);
+	    cairo_reset_clip (cr);
+	}
+    }
+#endif
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+static cairo_test_status_t
+record_paint (cairo_t *cr, int width, int height)
+{
+    return record_replay (cr, paint, width, height);
+}
+
+static cairo_test_status_t
+record_paint_alpha (cairo_t *cr, int width, int height)
+{
+    return record_replay (cr, paint_alpha, width, height);
+}
+
+static cairo_test_status_t
+record_paint_alpha_solid_clip (cairo_t *cr, int width, int height)
+{
+    return record_replay (cr, paint_alpha_solid_clip, width, height);
+}
+
+static cairo_test_status_t
+record_paint_alpha_clip (cairo_t *cr, int width, int height)
+{
+    return record_replay (cr, paint_alpha_clip, width, height);
+}
+
+static cairo_test_status_t
+record_paint_alpha_clip_mask (cairo_t *cr, int width, int height)
+{
+    return record_replay (cr, paint_alpha_clip_mask, width, height);
+}
+
+static cairo_test_status_t
+record_fill_alpha (cairo_t *cr, int width, int height)
+{
+    return record_replay (cr, fill_alpha, width, height);
+}
+
+static cairo_test_status_t
+record_self_intersecting (cairo_t *cr, int width, int height)
+{
+    return record_replay (cr, self_intersecting, width, height);
+}
+
+static cairo_test_status_t
+record_select_font_face (cairo_t *cr, int width, int height)
+{
+    return record_replay (cr, select_font_face, width, height);
+}
+
+static cairo_test_status_t
+record_text_transform (cairo_t *cr, int width, int height)
+{
+    return record_replay (cr, text_transform, width, height);
+}
+
+CAIRO_TEST (record2x_paint,
+	    "Test replayed calls to cairo_paint",
+	    "paint,record", /* keywords */
+	    NULL, /* requirements */
+	    2*8, 2*8,
+	    NULL, record_paint)
+CAIRO_TEST (record2x_paint_alpha,
+	    "Simple test of cairo_paint_with_alpha",
+	    "record, paint, alpha", /* keywords */
+	    NULL, /* requirements */
+	    2*32, 2*32,
+	    NULL, record_paint_alpha)
+CAIRO_TEST (record2x_paint_alpha_solid_clip,
+	    "Simple test of cairo_paint_with_alpha+unaligned clip",
+	    "record, paint, alpha, clip", /* keywords */
+	    NULL, /* requirements */
+	    2*32, 2*32,
+	    NULL, record_paint_alpha_solid_clip)
+CAIRO_TEST (record2x_paint_alpha_clip,
+	    "Simple test of cairo_paint_with_alpha+unaligned clip",
+	    "record, paint, alpha, clip", /* keywords */
+	    NULL, /* requirements */
+	    2*32, 2*32,
+	    NULL, record_paint_alpha_clip)
+CAIRO_TEST (record2x_paint_alpha_clip_mask,
+	    "Simple test of cairo_paint_with_alpha+triangular clip",
+	    "record, paint, alpha, clip", /* keywords */
+	    NULL, /* requirements */
+	    2*32, 2*32,
+	    NULL, record_paint_alpha_clip_mask)
+CAIRO_TEST (record2x_fill_alpha,
+	    "Tests using set_rgba();fill()",
+	    "record,fill, alpha", /* keywords */
+	    NULL, /* requirements */
+	    2*(2*SIZE + 4*PAD), 2*(2*SIZE + 4*PAD),
+	    NULL, record_fill_alpha)
+CAIRO_TEST (record2x_select_font_face,
+	    "Tests using cairo_select_font_face to draw text in different faces",
+	    "record, font", /* keywords */
+	    NULL, /* requirements */
+	    2*192, 2*(TEXT_SIZE + 4),
+	    NULL, record_select_font_face)
+CAIRO_TEST (record2x_self_intersecting,
+	    "Test strokes of self-intersecting paths",
+	    "record, stroke, trap", /* keywords */
+	    NULL, /* requirements */
+	    2*10, 2*20,
+	    NULL, record_self_intersecting)
+CAIRO_TEST (record2x_text_transform,
+	    "Test various applications of the font matrix",
+	    "record, text, transform", /* keywords */
+	    NULL, /* requirements */
+	    2*TT_SIZE, 2*TT_SIZE,
+	    NULL, record_text_transform)
diff --git a/test/reference/record1414x-fill-alpha.argb32.ref.png b/test/reference/record1414x-fill-alpha.argb32.ref.png
new file mode 100644
index 0000000..545c0da
Binary files /dev/null and b/test/reference/record1414x-fill-alpha.argb32.ref.png differ
diff --git a/test/reference/record1414x-fill-alpha.rgb24.ref.png b/test/reference/record1414x-fill-alpha.rgb24.ref.png
new file mode 100644
index 0000000..545c0da
Binary files /dev/null and b/test/reference/record1414x-fill-alpha.rgb24.ref.png differ
diff --git a/test/reference/record1414x-paint-alpha-clip-mask.argb32.ref.png b/test/reference/record1414x-paint-alpha-clip-mask.argb32.ref.png
new file mode 100644
index 0000000..13e8b9e
Binary files /dev/null and b/test/reference/record1414x-paint-alpha-clip-mask.argb32.ref.png differ
diff --git a/test/reference/record1414x-paint-alpha-clip-mask.rgb24.ref.png b/test/reference/record1414x-paint-alpha-clip-mask.rgb24.ref.png
new file mode 100644
index 0000000..13e8b9e
Binary files /dev/null and b/test/reference/record1414x-paint-alpha-clip-mask.rgb24.ref.png differ
diff --git a/test/reference/record1414x-paint-alpha-clip.argb32.ref.png b/test/reference/record1414x-paint-alpha-clip.argb32.ref.png
new file mode 100644
index 0000000..6c11f1d
Binary files /dev/null and b/test/reference/record1414x-paint-alpha-clip.argb32.ref.png differ
diff --git a/test/reference/record1414x-paint-alpha-clip.rgb24.ref.png b/test/reference/record1414x-paint-alpha-clip.rgb24.ref.png
new file mode 100644
index 0000000..6c11f1d
Binary files /dev/null and b/test/reference/record1414x-paint-alpha-clip.rgb24.ref.png differ
diff --git a/test/reference/record1414x-paint-alpha-solid-clip.argb32.ref.png b/test/reference/record1414x-paint-alpha-solid-clip.argb32.ref.png
new file mode 100644
index 0000000..7a8e594
Binary files /dev/null and b/test/reference/record1414x-paint-alpha-solid-clip.argb32.ref.png differ
diff --git a/test/reference/record1414x-paint-alpha-solid-clip.rgb24.ref.png b/test/reference/record1414x-paint-alpha-solid-clip.rgb24.ref.png
new file mode 100644
index 0000000..7a8e594
Binary files /dev/null and b/test/reference/record1414x-paint-alpha-solid-clip.rgb24.ref.png differ
diff --git a/test/reference/record1414x-paint-alpha.argb32.ref.png b/test/reference/record1414x-paint-alpha.argb32.ref.png
new file mode 100644
index 0000000..eee74ce
Binary files /dev/null and b/test/reference/record1414x-paint-alpha.argb32.ref.png differ
diff --git a/test/reference/record1414x-paint-alpha.rgb24.ref.png b/test/reference/record1414x-paint-alpha.rgb24.ref.png
new file mode 100644
index 0000000..eee74ce
Binary files /dev/null and b/test/reference/record1414x-paint-alpha.rgb24.ref.png differ
diff --git a/test/reference/record1414x-paint.argb32.ref.png b/test/reference/record1414x-paint.argb32.ref.png
new file mode 100644
index 0000000..e0a1341
Binary files /dev/null and b/test/reference/record1414x-paint.argb32.ref.png differ
diff --git a/test/reference/record1414x-paint.rgb24.ref.png b/test/reference/record1414x-paint.rgb24.ref.png
new file mode 100644
index 0000000..e0a1341
Binary files /dev/null and b/test/reference/record1414x-paint.rgb24.ref.png differ
diff --git a/test/reference/record1414x-select-font-face.argb32.ref.png b/test/reference/record1414x-select-font-face.argb32.ref.png
new file mode 100644
index 0000000..6c52067
Binary files /dev/null and b/test/reference/record1414x-select-font-face.argb32.ref.png differ
diff --git a/test/reference/record1414x-select-font-face.rgb24.ref.png b/test/reference/record1414x-select-font-face.rgb24.ref.png
new file mode 100644
index 0000000..6c52067
Binary files /dev/null and b/test/reference/record1414x-select-font-face.rgb24.ref.png differ
diff --git a/test/reference/record1414x-self-intersecting.argb32.ref.png b/test/reference/record1414x-self-intersecting.argb32.ref.png
new file mode 100644
index 0000000..4469acd
Binary files /dev/null and b/test/reference/record1414x-self-intersecting.argb32.ref.png differ
diff --git a/test/reference/record1414x-self-intersecting.rgb24.ref.png b/test/reference/record1414x-self-intersecting.rgb24.ref.png
new file mode 100644
index 0000000..4469acd
Binary files /dev/null and b/test/reference/record1414x-self-intersecting.rgb24.ref.png differ
diff --git a/test/reference/record1414x-text-transform.argb32.ref.png b/test/reference/record1414x-text-transform.argb32.ref.png
new file mode 100644
index 0000000..d4ea980
Binary files /dev/null and b/test/reference/record1414x-text-transform.argb32.ref.png differ
diff --git a/test/reference/record1414x-text-transform.rgb24.ref.png b/test/reference/record1414x-text-transform.rgb24.ref.png
new file mode 100644
index 0000000..d4ea980
Binary files /dev/null and b/test/reference/record1414x-text-transform.rgb24.ref.png differ
diff --git a/test/reference/record2x-fill-alpha.argb32.ref.png b/test/reference/record2x-fill-alpha.argb32.ref.png
new file mode 100644
index 0000000..ce4dab1
Binary files /dev/null and b/test/reference/record2x-fill-alpha.argb32.ref.png differ
diff --git a/test/reference/record2x-fill-alpha.rgb24.ref.png b/test/reference/record2x-fill-alpha.rgb24.ref.png
new file mode 100644
index 0000000..ce4dab1
Binary files /dev/null and b/test/reference/record2x-fill-alpha.rgb24.ref.png differ
diff --git a/test/reference/record2x-paint-alpha-clip-mask.argb32.ref.png b/test/reference/record2x-paint-alpha-clip-mask.argb32.ref.png
new file mode 100644
index 0000000..6dc5cb5
Binary files /dev/null and b/test/reference/record2x-paint-alpha-clip-mask.argb32.ref.png differ
diff --git a/test/reference/record2x-paint-alpha-clip-mask.rgb24.ref.png b/test/reference/record2x-paint-alpha-clip-mask.rgb24.ref.png
new file mode 100644
index 0000000..6dc5cb5
Binary files /dev/null and b/test/reference/record2x-paint-alpha-clip-mask.rgb24.ref.png differ
diff --git a/test/reference/record2x-paint-alpha-clip.argb32.ref.png b/test/reference/record2x-paint-alpha-clip.argb32.ref.png
new file mode 100644
index 0000000..b3829d5
Binary files /dev/null and b/test/reference/record2x-paint-alpha-clip.argb32.ref.png differ
diff --git a/test/reference/record2x-paint-alpha-clip.rgb24.ref.png b/test/reference/record2x-paint-alpha-clip.rgb24.ref.png
new file mode 100644
index 0000000..b3829d5
Binary files /dev/null and b/test/reference/record2x-paint-alpha-clip.rgb24.ref.png differ
diff --git a/test/reference/record2x-paint-alpha-solid-clip.argb32.ref.png b/test/reference/record2x-paint-alpha-solid-clip.argb32.ref.png
new file mode 100644
index 0000000..06e350f
Binary files /dev/null and b/test/reference/record2x-paint-alpha-solid-clip.argb32.ref.png differ
diff --git a/test/reference/record2x-paint-alpha-solid-clip.rgb24.ref.png b/test/reference/record2x-paint-alpha-solid-clip.rgb24.ref.png
new file mode 100644
index 0000000..06e350f
Binary files /dev/null and b/test/reference/record2x-paint-alpha-solid-clip.rgb24.ref.png differ
diff --git a/test/reference/record2x-paint-alpha.argb32.ref.png b/test/reference/record2x-paint-alpha.argb32.ref.png
new file mode 100644
index 0000000..3a02b67
Binary files /dev/null and b/test/reference/record2x-paint-alpha.argb32.ref.png differ
diff --git a/test/reference/record2x-paint-alpha.rgb24.ref.png b/test/reference/record2x-paint-alpha.rgb24.ref.png
new file mode 100644
index 0000000..3a02b67
Binary files /dev/null and b/test/reference/record2x-paint-alpha.rgb24.ref.png differ
diff --git a/test/reference/record2x-paint.argb32.ref.png b/test/reference/record2x-paint.argb32.ref.png
new file mode 100644
index 0000000..792a1d0
Binary files /dev/null and b/test/reference/record2x-paint.argb32.ref.png differ
diff --git a/test/reference/record2x-paint.rgb24.ref.png b/test/reference/record2x-paint.rgb24.ref.png
new file mode 100644
index 0000000..792a1d0
Binary files /dev/null and b/test/reference/record2x-paint.rgb24.ref.png differ
diff --git a/test/reference/record2x-select-font-face.argb32.ref.png b/test/reference/record2x-select-font-face.argb32.ref.png
new file mode 100644
index 0000000..7a99795
Binary files /dev/null and b/test/reference/record2x-select-font-face.argb32.ref.png differ
diff --git a/test/reference/record2x-select-font-face.rgb24.ref.png b/test/reference/record2x-select-font-face.rgb24.ref.png
new file mode 100644
index 0000000..7a99795
Binary files /dev/null and b/test/reference/record2x-select-font-face.rgb24.ref.png differ
diff --git a/test/reference/record2x-self-intersecting.argb32.ref.png b/test/reference/record2x-self-intersecting.argb32.ref.png
new file mode 100644
index 0000000..2836dae
Binary files /dev/null and b/test/reference/record2x-self-intersecting.argb32.ref.png differ
diff --git a/test/reference/record2x-self-intersecting.rgb24.ref.png b/test/reference/record2x-self-intersecting.rgb24.ref.png
new file mode 100644
index 0000000..2836dae
Binary files /dev/null and b/test/reference/record2x-self-intersecting.rgb24.ref.png differ
diff --git a/test/reference/record2x-text-transform.argb32.ref.png b/test/reference/record2x-text-transform.argb32.ref.png
new file mode 100644
index 0000000..1251826
Binary files /dev/null and b/test/reference/record2x-text-transform.argb32.ref.png differ
diff --git a/test/reference/record2x-text-transform.rgb24.ref.png b/test/reference/record2x-text-transform.rgb24.ref.png
new file mode 100644
index 0000000..1251826
Binary files /dev/null and b/test/reference/record2x-text-transform.rgb24.ref.png differ


More information about the cairo-commit mailing list