[cairo-commit] cairo/src cairo-gstate.c,1.156,1.157

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv5967/src

Modified Files:
	cairo-gstate.c 
Log Message:

2005-08-05  Carl Worth  <cworth at cworth.org>

        * src/cairo-gstate.c: (_cairo_gstate_translate),
        (_cairo_gstate_scale), (_cairo_gstate_rotate),
        (_cairo_gstate_transform), (_cairo_gstate_set_matrix),
        (_cairo_gstate_identity_matrix), (_cairo_gstate_unset_scaled_font),
        (_cairo_gstate_set_font_size), (_cairo_gstate_set_font_matrix),
        (_cairo_gstate_set_font_options),
        (_cairo_gstate_ensure_scaled_font),
        (_cairo_gstate_get_font_extents), (_cairo_gstate_text_to_glyphs),
        (_cairo_gstate_set_font_face), (_cairo_gstate_glyph_extents),
        (_cairo_gstate_show_glyphs), (_cairo_gstate_glyph_path):
        Rename two functions:

        _cairo_gstate_unset_font  -> _cairo_gstate_unset_scaled_font
        _cairo_gstate_ensure_font -> _cairo_gstate_ensure_scaled_font


Index: cairo-gstate.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-gstate.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- cairo-gstate.c	6 Aug 2005 03:53:09 -0000	1.156
+++ cairo-gstate.c	6 Aug 2005 04:27:21 -0000	1.157
@@ -57,13 +57,13 @@
 					     cairo_traps_t  *traps);
 
 static cairo_status_t
-_cairo_gstate_ensure_font (cairo_gstate_t *gstate);
+_cairo_gstate_ensure_font_face (cairo_gstate_t *gstate);
 
 static cairo_status_t
-_cairo_gstate_ensure_font_face (cairo_gstate_t *gstate);
+_cairo_gstate_ensure_scaled_font (cairo_gstate_t *gstate);
 
 static void
-_cairo_gstate_unset_font (cairo_gstate_t *gstate);
+_cairo_gstate_unset_scaled_font (cairo_gstate_t *gstate);
 
 cairo_gstate_t *
 _cairo_gstate_create (cairo_surface_t *target)
@@ -474,7 +474,7 @@
 {
     cairo_matrix_t tmp;
 
-    _cairo_gstate_unset_font (gstate);
+    _cairo_gstate_unset_scaled_font (gstate);
     
     cairo_matrix_init_translate (&tmp, tx, ty);
     cairo_matrix_multiply (&gstate->ctm, &tmp, &gstate->ctm);
@@ -493,7 +493,7 @@
     if (sx == 0 || sy == 0)
 	return CAIRO_STATUS_INVALID_MATRIX;
 
-    _cairo_gstate_unset_font (gstate);
+    _cairo_gstate_unset_scaled_font (gstate);
     
     cairo_matrix_init_scale (&tmp, sx, sy);
     cairo_matrix_multiply (&gstate->ctm, &tmp, &gstate->ctm);
@@ -509,7 +509,7 @@
 {
     cairo_matrix_t tmp;
 
-    _cairo_gstate_unset_font (gstate);
+    _cairo_gstate_unset_scaled_font (gstate);
     
     cairo_matrix_init_rotate (&tmp, angle);
     cairo_matrix_multiply (&gstate->ctm, &tmp, &gstate->ctm);
@@ -526,7 +526,7 @@
 {
     cairo_matrix_t tmp;
 
-    _cairo_gstate_unset_font (gstate);
+    _cairo_gstate_unset_scaled_font (gstate);
     
     tmp = *matrix;
     cairo_matrix_multiply (&gstate->ctm, &tmp, &gstate->ctm);
@@ -543,7 +543,7 @@
 {
     cairo_status_t status;
 
-    _cairo_gstate_unset_font (gstate);
+    _cairo_gstate_unset_scaled_font (gstate);
     
     gstate->ctm = *matrix;
 
@@ -558,7 +558,7 @@
 cairo_status_t
 _cairo_gstate_identity_matrix (cairo_gstate_t *gstate)
 {
-    _cairo_gstate_unset_font (gstate);
+    _cairo_gstate_unset_scaled_font (gstate);
     
     cairo_matrix_init_identity (&gstate->ctm);
     cairo_matrix_init_identity (&gstate->ctm_inverse);
@@ -1387,7 +1387,7 @@
 }
 
 static void
-_cairo_gstate_unset_font (cairo_gstate_t *gstate)
+_cairo_gstate_unset_scaled_font (cairo_gstate_t *gstate)
 {
     if (gstate->scaled_font) {
 	cairo_scaled_font_destroy (gstate->scaled_font);
@@ -1417,7 +1417,7 @@
 _cairo_gstate_set_font_size (cairo_gstate_t *gstate, 
 			     double          size)
 {
-    _cairo_gstate_unset_font (gstate);
+    _cairo_gstate_unset_scaled_font (gstate);
 
     cairo_matrix_init_scale (&gstate->font_matrix, size, size);
 
@@ -1428,7 +1428,7 @@
 _cairo_gstate_set_font_matrix (cairo_gstate_t	    *gstate, 
 			       const cairo_matrix_t *matrix)
 {
-    _cairo_gstate_unset_font (gstate);
+    _cairo_gstate_unset_scaled_font (gstate);
 
     gstate->font_matrix = *matrix;
 
@@ -1446,7 +1446,7 @@
 _cairo_gstate_set_font_options (cairo_gstate_t             *gstate,
 				const cairo_font_options_t *options)
 {
-    _cairo_gstate_unset_font (gstate);
+    _cairo_gstate_unset_scaled_font (gstate);
 
     gstate->font_options = *options;
 
@@ -1570,7 +1570,7 @@
 }
     
 static cairo_status_t
-_cairo_gstate_ensure_font (cairo_gstate_t *gstate)
+_cairo_gstate_ensure_scaled_font (cairo_gstate_t *gstate)
 {
     cairo_status_t status;
     cairo_font_options_t options;
@@ -1600,7 +1600,7 @@
 _cairo_gstate_get_font_extents (cairo_gstate_t *gstate, 
 				cairo_font_extents_t *extents)
 {
-    cairo_status_t status = _cairo_gstate_ensure_font (gstate);
+    cairo_status_t status = _cairo_gstate_ensure_scaled_font (gstate);
     if (status)
 	return status;
 
@@ -1620,7 +1620,7 @@
     cairo_status_t status;
     int i;
 
-    status = _cairo_gstate_ensure_font (gstate);
+    status = _cairo_gstate_ensure_scaled_font (gstate);
     if (status)
 	return status;
     
@@ -1660,7 +1660,7 @@
 	    cairo_font_face_reference (gstate->font_face);
     }
 
-    _cairo_gstate_unset_font (gstate);
+    _cairo_gstate_unset_scaled_font (gstate);
     
     return CAIRO_STATUS_SUCCESS;
 }
@@ -1673,7 +1673,7 @@
 {
     cairo_status_t status;
 
-    status = _cairo_gstate_ensure_font (gstate);
+    status = _cairo_gstate_ensure_scaled_font (gstate);
     if (status)
 	return status;
 
@@ -1703,7 +1703,7 @@
     if (status)
 	return status;
 
-    status = _cairo_gstate_ensure_font (gstate);
+    status = _cairo_gstate_ensure_scaled_font (gstate);
     if (status)
 	return status;
     
@@ -1841,7 +1841,7 @@
     int i;
     cairo_glyph_t *transformed_glyphs = NULL;
 
-    status = _cairo_gstate_ensure_font (gstate);
+    status = _cairo_gstate_ensure_scaled_font (gstate);
     if (status)
 	return status;