[cairo-commit] test/Makefile.am test/text-rotate.c test/text-rotate-ps-argb32-ref.png test/text-rotate-ref.png test/text-rotate-rgb24-ref.png test/text-rotate-svg-ref.png

[Behdad Esfahbod]

 dev/null                           |binary
 test/Makefile.am                   |    6 +++---
 test/text-rotate-ps-argb32-ref.png |binary
 test/text-rotate-ref.png           |binary
 test/text-rotate-rgb24-ref.png     |    0 
 test/text-rotate-svg-ref.png       |binary
 test/text-rotate.c                 |   12 +++++++++++-
 7 files changed, 14 insertions(+), 4 deletions(-)

New commits:
diff-tree 155a1b48f6c8265ad5dd594354b66b3e8341bade (from b54174e917e273143455661d565412fb9a185bfb)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Feb 21 13:52:17 2007 -0500

    [test] Remove text-rotate test from XFAIL as the bugs are fixed now
    
    All missing is subpixel text positioning, but we don't need an XFAIL test
    to remind us for that.

diff --git a/test/Makefile.am b/test/Makefile.am
index c39d4c8..3382cf4 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -330,7 +330,8 @@ text-pattern-rgb24-ref.png				\
 text-pattern-svg-argb32-ref.png				\
 text-pattern-svg-rgb24-ref.png				\
 text-rotate-ref.png					\
-text-rotate-rgb24-ref.png				\
+text-rotate-ps-argb32-ref.png				\
+text-rotate-svg-ref.png					\
 text-zero-len-ref.png					\
 transforms-ref.png					\
 translate-show-surface-ref.png				\
@@ -361,8 +362,7 @@ extend-reflect			\
 filter-nearest-offset		\
 long-lines			\
 self-intersecting		\
-text-glyph-range		\
-text-rotate
+text-glyph-range
 
 # Any test that doesn't generate a log file goes here
 NOLOG_TESTS =			\
diff --git a/test/text-rotate-ps-argb32-ref.png b/test/text-rotate-ps-argb32-ref.png
new file mode 100644
index 0000000..a6eb5ea
Binary files /dev/null and b/test/text-rotate-ps-argb32-ref.png differ
diff --git a/test/text-rotate-ref.png b/test/text-rotate-ref.png
index 7c1c365..b227398 100644
Binary files a/test/text-rotate-ref.png and b/test/text-rotate-ref.png differ
diff --git a/test/text-rotate-rgb24-ref.png b/test/text-rotate-rgb24-ref.png
deleted file mode 100644
index 1db3991..0000000
Binary files a/test/text-rotate-rgb24-ref.png and /dev/null differ
diff --git a/test/text-rotate-svg-ref.png b/test/text-rotate-svg-ref.png
new file mode 100644
index 0000000..35fd019
Binary files /dev/null and b/test/text-rotate-svg-ref.png differ
diff --git a/test/text-rotate.c b/test/text-rotate.c
index 2c3af02..43b8e2a 100644
--- a/test/text-rotate.c
+++ b/test/text-rotate.c
@@ -75,6 +75,12 @@
  *   us look more closely at the remaining positioning problems. (In
  *   particular, I want to make sure we're rounding as well as
  *   possible).
+ *
+ * 2007-02-21
+ *
+ *   Seems like all the "bugs" have been fixed and all remainint is
+ *   missing support for subpixel glyph positioning.  Removing from
+ *   XFAIL now.
  */
 
 #include "cairo-test.h"
@@ -89,7 +95,6 @@ static cairo_test_draw_function_t draw;
 cairo_test_t test = {
     "text-rotate",
     "Tests show_text under various rotations"
-    "\nminor bugs in positioning rotated glyphs",
     WIDTH, HEIGHT,
     draw
 };
@@ -103,6 +108,11 @@ draw (cairo_t *cr, int width, int height
     cairo_font_options_t *font_options;
     static char text[] = "cairo";
 
+    /* paint white so we don't need separate ref images for
+     * RGB24 and ARGB32 */
+    cairo_set_source_rgb (cr, 1., 1., 1.);
+    cairo_paint (cr);
+
     cairo_select_font_face (cr, "Bitstream Vera Sans",
 			    CAIRO_FONT_SLANT_NORMAL,
 			    CAIRO_FONT_WEIGHT_NORMAL);