[cairo-commit] 2 commits - src/cairo-xlib-surface.c test/xcomposite-projection.c

[Benjamin Otte]

 src/cairo-xlib-surface.c     |   16 ++++++++--------
 test/xcomposite-projection.c |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit a9f37953c71e16f65122097462e51b035783a965
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Nov 4 13:59:58 2009 +0100

    [xlib] Use correct number when checking if points are out of range

diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index fc235a9..92605ff 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -2506,14 +2506,14 @@ static cairo_bool_t
 _line_exceeds_16_16 (const cairo_line_t *line)
 {
     return
-	line->p1.x < CAIRO_FIXED_16_16_MIN ||
-	line->p1.x > CAIRO_FIXED_16_16_MAX ||
-	line->p2.x < CAIRO_FIXED_16_16_MIN ||
-	line->p2.x > CAIRO_FIXED_16_16_MAX ||
-	line->p1.y < CAIRO_FIXED_16_16_MIN ||
-	line->p1.y > CAIRO_FIXED_16_16_MAX ||
-	line->p2.y < CAIRO_FIXED_16_16_MIN ||
-	line->p2.y > CAIRO_FIXED_16_16_MAX;
+	line->p1.x < _cairo_fixed_from_int (CAIRO_FIXED_16_16_MIN) ||
+	line->p1.x > _cairo_fixed_from_int (CAIRO_FIXED_16_16_MAX) ||
+	line->p2.x < _cairo_fixed_from_int (CAIRO_FIXED_16_16_MIN) ||
+	line->p2.x > _cairo_fixed_from_int (CAIRO_FIXED_16_16_MAX) ||
+	line->p1.y < _cairo_fixed_from_int (CAIRO_FIXED_16_16_MIN) ||
+	line->p1.y > _cairo_fixed_from_int (CAIRO_FIXED_16_16_MAX) ||
+	line->p2.y < _cairo_fixed_from_int (CAIRO_FIXED_16_16_MIN) ||
+	line->p2.y > _cairo_fixed_from_int (CAIRO_FIXED_16_16_MAX);
 }
 
 static void
commit aa1f245ea313a2f1f0dda3994f5b48073b0c385d
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Nov 4 13:56:15 2009 +0100

    [test] Add "target=raster" to test
    
    The test isn't useful on vector backends and fails there due to
    antialiasing issues.

diff --git a/test/xcomposite-projection.c b/test/xcomposite-projection.c
index 2beb661..f36697a 100644
--- a/test/xcomposite-projection.c
+++ b/test/xcomposite-projection.c
@@ -76,6 +76,6 @@ draw (cairo_t *cr, int width, int height)
 CAIRO_TEST (xcomposite_projection,
 	    "Test a bug with XRenderComposite reference computation when projecting the first trapezoid onto 16.16 space",
 	    "xlib", /* keywords */
-	    NULL, /* requirements */
+	    "target=raster", /* requirements */
 	    300, 150,
 	    NULL, draw)