[cairo-commit] cairo/src cairo-font.c, 1.51, 1.52 cairoint.h, 1.162, 1.163

[Carl Worth]

Committed by: cworth

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

Modified Files:
	cairo-font.c cairoint.h 
Log Message:

        * src/cairoint.h:
        * src/cairo-font.c: (_cairo_simple_font_face_create_font): Rename
        CAIRO_FONT_BACKEND_DEFAULT to the more accurate
        CAIRO_SCALED_FONT_BACKEND_DEFAULT.


Index: cairo-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-font.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- cairo-font.c	26 Jun 2005 06:24:19 -0000	1.51
+++ cairo-font.c	13 Jul 2005 18:34:37 -0000	1.52
@@ -360,7 +360,8 @@
 				     const cairo_matrix_t *ctm,
 				     cairo_scaled_font_t **scaled_font)
 {
-    const cairo_scaled_font_backend_t *backend = CAIRO_FONT_BACKEND_DEFAULT;
+    const cairo_scaled_font_backend_t * backend = CAIRO_SCALED_FONT_BACKEND_DEFAULT;
+
     cairo_simple_font_face_t *simple_face = abstract_face;
 
     return backend->create (simple_face->family, simple_face->slant, simple_face->weight,

Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- cairoint.h	11 Jul 2005 23:07:09 -0000	1.162
+++ cairoint.h	13 Jul 2005 18:34:37 -0000	1.163
@@ -949,17 +949,17 @@
 #if   CAIRO_HAS_WIN32_FONT
 
 #define CAIRO_FONT_FAMILY_DEFAULT CAIRO_WIN32_FONT_FAMILY_DEFAULT
-#define CAIRO_FONT_BACKEND_DEFAULT &cairo_win32_scaled_font_backend
+#define CAIRO_SCALED_FONT_BACKEND_DEFAULT &cairo_win32_scaled_font_backend
 
 #elif CAIRO_HAS_ATSUI_FONT
 
 #define CAIRO_FONT_FAMILY_DEFAULT CAIRO_ATSUI_FONT_FAMILY_DEFAULT
-#define CAIRO_FONT_BACKEND_DEFAULT &cairo_atsui_scaled_font_backend
+#define CAIRO_SCALED_FONT_BACKEND_DEFAULT &cairo_atsui_scaled_font_backend
 
 #elif CAIRO_HAS_FT_FONT
 
 #define CAIRO_FONT_FAMILY_DEFAULT CAIRO_FT_FONT_FAMILY_DEFAULT
-#define CAIRO_FONT_BACKEND_DEFAULT &cairo_ft_scaled_font_backend
+#define CAIRO_SCALED_FONT_BACKEND_DEFAULT &cairo_ft_scaled_font_backend
 
 #endif