[cairo-commit] cairo/test coverage.c, 1.4, 1.5 text-cache-crash.c, 1.6, 1.7 text-rotate.c, 1.5, 1.6

[Owen Taylor]

Committed by: otaylor

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

Modified Files:
	coverage.c text-cache-crash.c text-rotate.c 
Log Message:
2005-04-07  Owen Taylor  <otaylor at redhat.com>

        * src/cairo.[ch] src/cairoint.h src/cairo-gstate.c
        docs/public/cairo-sections.txt:
        cairo_select_font() => cairo_select_font_face()
        cairo_scale_font() => cairo_set_font_size()
        cairo_transform_font() => cairo_set_font_matrix()
        Add cairo_get_font_matrix(). Make cairo_set_font_face()
        not reset the font matrix. Default the font matrix
        to SCALE(10). Document cairo_select_font_face().

        * test/coverage.c (draw) test/text-cache-crash.c (draw)
        test/text-rotate.c (draw): Use cairo_set_font_size().

        * src/cairo-font.c src/cairo.h: Fix up some parameter
        names for docs.


Index: coverage.c
===================================================================
RCS file: /cvs/cairo/cairo/test/coverage.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- coverage.c	29 Mar 2005 08:02:19 -0000	1.4
+++ coverage.c	7 Apr 2005 20:29:32 -0000	1.5
@@ -140,7 +140,7 @@
     cairo_select_font (cr, fontname,
 		       CAIRO_FONT_SLANT_NORMAL,
 		       CAIRO_FONT_WEIGHT_BOLD);
-    cairo_scale_font (cr, fontsize);
+    cairo_set_font_size (cr, fontsize);
 
     for (j = 0; j < ARRAY_SIZE (draw_funcs); j++) {
 	for (i = 0; i < ARRAY_SIZE (pattern_funcs); i++) {

Index: text-cache-crash.c
===================================================================
RCS file: /cvs/cairo/cairo/test/text-cache-crash.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- text-cache-crash.c	29 Mar 2005 08:02:19 -0000	1.6
+++ text-cache-crash.c	7 Apr 2005 20:29:32 -0000	1.7
@@ -74,10 +74,10 @@
 {
     /* Once there was a bug that choked when selecting the same font twice. */
     cairo_select_font(cr, "sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
-    cairo_scale_font(cr, 40.0);
+    cairo_set_font_size(cr, 40.0);
 
     cairo_select_font(cr, "sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
-    cairo_scale_font(cr, 40.0);
+    cairo_set_font_size(cr, 40.0);
     cairo_move_to(cr, 10, 50);
     cairo_show_text(cr, "hello");
 
@@ -102,7 +102,7 @@
    But in the meantime, I need "make check" not to destory work, so
    I'm commenting this test out for now.
 
-    cairo_scale_font (cr, 500);
+    cairo_set_font_size (cr, 500);
     cairo_show_text (cr, "hello");
 */
 

Index: text-rotate.c
===================================================================
RCS file: /cvs/cairo/cairo/test/text-rotate.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- text-rotate.c	29 Mar 2005 08:02:19 -0000	1.5
+++ text-rotate.c	7 Apr 2005 20:29:32 -0000	1.6
@@ -81,7 +81,7 @@
     cairo_select_font (cr, "Bitstream Vera Sans",
 		       CAIRO_FONT_SLANT_NORMAL,
 		       CAIRO_FONT_WEIGHT_NORMAL);
-    cairo_scale_font (cr, TEXT_SIZE);
+    cairo_set_font_size (cr, TEXT_SIZE);
 
     cairo_set_rgb_color (cr, 0,0,0);