[cairo-commit] cairo/test Makefile.am, 1.14, 1.15 pixman_rotate-ref.png, NONE, 1.1 pixman_rotate.c, NONE, 1.1

Kristian Hogsberg commit at pdx.freedesktop.org
Mon Feb 7 09:38:46 PST 2005


Committed by: krh

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

Modified Files:
	Makefile.am 
Added Files:
	pixman_rotate-ref.png pixman_rotate.c 
Log Message:
2005-02-07  Kristian Høgsberg  <krh at redhat.com>

        * test/pixman_rotate.c, test/pixman_rotate-ref.png: New test case
        which exposes off-by-one rotation error in pixman.



Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/test/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.am	28 Jan 2005 20:27:23 -0000	1.14
+++ Makefile.am	7 Feb 2005 17:38:43 -0000	1.15
@@ -7,7 +7,8 @@
 text_cache_crash	\
 text_rotate		\
 coverage		\
-clip_twice
+clip_twice		\
+pixman_rotate
 
 # And all new test go here too. I really don't like having to repeat
 # this list. Anyone know a good way to avoid it? Can I use a wildcard
@@ -18,7 +19,8 @@
 line_width-ref.png		\
 move_to_show_surface-ref.png	\
 coverage-ref.png		\
-clip_twice-ref.png
+clip_twice-ref.png		\
+pixman_rotate-ref.png
 
 # Once we can draw the text_rotate.c test case correctly, we should
 # create and add text_rotate-ref.png to the list of reference PNGs.
@@ -71,6 +73,7 @@
 text_rotate_SOURCES = text_rotate.c $(cairo_test_lib)
 coverage_SOURCES = coverage.c $(cairo_test_lib)
 clip_twice_SOURCES = clip_twice.c $(cairo_test_lib)
+pixman_rotate_SOURCES = pixman_rotate.c $(cairo_test_lib)
 
 noinst_PROGRAMS = imagediff
 imagediff_SOURCES = imagediff.c $(cairo_test_lib)

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

--- NEW FILE: pixman_rotate.c ---
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>

#include <cairo.h>
#include <cairo-png.h>
#include <cairo-pdf.h>

#include "cairo_test.h"

#define WIDTH	32
#define HEIGHT	WIDTH

#define IMAGE_WIDTH	(3 * WIDTH)
#define IMAGE_HEIGHT	IMAGE_WIDTH

cairo_test_t test = {
    "pixman_rotate",
    "Exposes pixman off-by-one error when rotating",
    IMAGE_WIDTH, IMAGE_HEIGHT
};

/* Draw the word cairo at NUM_TEXT different angles */
static void
draw (cairo_t *cr, int width, int height)
{
    cairo_surface_t *target, *stamp;

    target = cairo_current_target_surface (cr);
    cairo_surface_reference (target);

    stamp = cairo_surface_create_similar (target, CAIRO_FORMAT_ARGB32,
					  WIDTH, HEIGHT);
    cairo_set_target_surface (cr, stamp);
    cairo_new_path (cr);
    cairo_rectangle (cr, WIDTH / 4, HEIGHT / 4, WIDTH / 2, HEIGHT / 2);
    cairo_set_rgb_color (cr, 1, 0, 0);
    cairo_set_alpha (cr, 0.8);
    cairo_fill (cr);

    cairo_rectangle (cr, 0, 0, WIDTH, HEIGHT);
    cairo_set_line_width (cr, 2);
    cairo_set_rgb_color (cr, 0, 0, 0);
    cairo_set_alpha (cr, 1);
    cairo_stroke (cr);

    cairo_set_target_surface (cr, target);

    /* Draw a translucent rectangle for reference where the rotated
     * image should be. */
    cairo_new_path (cr);
    cairo_rectangle (cr, WIDTH, HEIGHT, WIDTH, HEIGHT);
    cairo_set_rgb_color (cr, 1, 1, 0);
    cairo_set_alpha (cr, 0.3);
    cairo_fill (cr);

#if 1 /* Set to 0 to generate reference image */
    cairo_translate (cr, 2 * WIDTH, 2 * HEIGHT);
    cairo_rotate (cr, M_PI);
#else
    cairo_translate (cr, WIDTH, HEIGHT);
#endif

    cairo_set_alpha (cr, 1);
    cairo_show_surface (cr, stamp, WIDTH + 2, HEIGHT + 2);

    cairo_show_page (cr);

    cairo_surface_destroy (stamp);
    cairo_surface_destroy (target);
}

int
main (void)
{
    return cairo_test (&test, draw);
}




More information about the cairo-commit mailing list