[cairo-commit] 2 commits - boilerplate/cairo-boilerplate.c test/cairo-test.c

Chris Wilson ickle at kemper.freedesktop.org
Thu Oct 30 13:23:32 PDT 2008


 boilerplate/cairo-boilerplate.c |    2 --
 test/cairo-test.c               |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit f03d3f9f7f923730cdc4c5f21364f752f705086a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Oct 30 19:24:29 2008 +0000

    [boilerplate] Remove #if VERSION>1.9.0
    
    Remove the obsolete #if statement.

diff --git a/boilerplate/cairo-boilerplate.c b/boilerplate/cairo-boilerplate.c
index ee238ee..c2fa911 100644
--- a/boilerplate/cairo-boilerplate.c
+++ b/boilerplate/cairo-boilerplate.c
@@ -531,7 +531,6 @@ static cairo_boilerplate_target_t targets[] =
 /* Disable the svg12 testing for the 1.8.2 release, but in a way that it
  * will come back on immediately afterward even if we forget to remove
  * this condition. */
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 9, 0)
     { "svg12", NULL, CAIRO_SURFACE_TYPE_SVG, CAIRO_CONTENT_COLOR_ALPHA, 1,
       _cairo_boilerplate_svg12_create_surface,
       _cairo_boilerplate_svg_force_fallbacks,
@@ -549,7 +548,6 @@ static cairo_boilerplate_target_t targets[] =
       _cairo_boilerplate_svg_cleanup,
       NULL, TRUE },
 #endif
-#endif
 #if CAIRO_HAS_BEOS_SURFACE
     /* BeOS sometimes produces a slightly different image. Perhaps this
      * is related to the fact that it doesn't use premultiplied alpha...
commit ef98eb26f7484019b023cd4c93dce44f23e3a594
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Oct 30 19:23:17 2008 +0000

    [test] Reenable device offset testing.
    
    Restore device offset testing that was temporarily disable in the run up
    to the 1.8 release.

diff --git a/test/cairo-test.c b/test/cairo-test.c
index 12fc3ad..c2364a9 100644
--- a/test/cairo-test.c
+++ b/test/cairo-test.c
@@ -95,7 +95,7 @@ static const char *fail_face = "", *normal_face = "";
 #define CAIRO_TEST_REF_SUFFIX "-ref.png"
 #define CAIRO_TEST_DIFF_SUFFIX "-diff.png"
 
-#define NUM_DEVICE_OFFSETS 1
+#define NUM_DEVICE_OFFSETS 2
 
 static const char *vector_ignored_tests[] = {
     /* We can't match the results of tests that depend on


More information about the cairo-commit mailing list