[cairo-commit] cairo/test .cvsignore, 1.44, 1.45 text-pattern-ref.png, 1.1, 1.2 text-pattern.c, 1.1, 1.2

[Owen Taylor]

Committed by: otaylor

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

Modified Files:
	.cvsignore text-pattern-ref.png text-pattern.c 
Log Message:
2005-08-18  Owen Taylor  <otaylor at redhat.com>

        * src/cairo-xlib-surface.c (_cairo_xlib_surface_show_glyphs): Fix offset
        passed in for source patterns. (#2333, Tim Rowley)

        * test/text-pattern.c: Fix font to Vera Sans rather than "Sans"


Index: .cvsignore
===================================================================
RCS file: /cvs/cairo/cairo/test/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- .cvsignore	18 Aug 2005 22:50:36 -0000	1.44
+++ .cvsignore	19 Aug 2005 00:19:54 -0000	1.45
@@ -52,6 +52,7 @@
 text-antialias-none
 text-antialias-subpixel
 text-cache-crash
+text-pattern
 text-rotate
 transforms
 translate-show-surface

Index: text-pattern-ref.png
===================================================================
RCS file: /cvs/cairo/cairo/test/text-pattern-ref.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsZH2YAY and /tmp/cvsifIF8h differ

Index: text-pattern.c
===================================================================
RCS file: /cvs/cairo/cairo/test/text-pattern.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- text-pattern.c	18 Aug 2005 23:22:23 -0000	1.1
+++ text-pattern.c	19 Aug 2005 00:19:54 -0000	1.2
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004 Red Hat, Inc.
+ * Copyright © 2005 Tim Rowley
  *
  * Permission to use, copy, modify, distribute, and sell this software
  * and its documentation for any purpose is hereby granted without
@@ -20,7 +20,7 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * Author: Carl D. Worth <cworth at cworth.org>
+ * Author: Tim Rowley
  */
 
 #include "cairo-test.h"
@@ -48,6 +48,10 @@
   cairo_set_font_options (cr, font_options);
   cairo_font_options_destroy (font_options);
   
+  cairo_select_font_face (cr, "Bitstream Vera Sans",
+			  CAIRO_FONT_SLANT_NORMAL,
+			  CAIRO_FONT_WEIGHT_NORMAL);
+  
   cairo_scale (cr, width, height);
 
   pat = cairo_pattern_create_linear (0.0, 0.0, 1, 1);
@@ -59,7 +63,6 @@
   cairo_rectangle (cr, 0, 0, 0.1, 1);
   cairo_fill (cr);
   
-  cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
   cairo_set_font_size (cr, 0.4);
   cairo_move_to (cr, 0.1, 0.6);
   cairo_show_text (cr, "cairo");