[cairo-commit] cairo/src cairo-atsui-font.c, 1.17, 1.18 cairo-font.c, 1.63, 1.64 cairo-ft-font.c, 1.89, 1.90 cairo-win32-font.c, 1.34, 1.35 cairoint.h, 1.180, 1.181

[Carl Worth]

Committed by: cworth

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

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

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

        * src/cairoint.h: Rename scaled_font_backend->destroy to the more
        accurate fini, (since it frees only the dependent data within the
        scaled_font and not the scaled_font itself).

        * src/cairo-atsui-font.c: (_cairo_atsui_font_fini):
        * src/cairo-font.c: (cairo_scaled_font_destroy):
        * src/cairo-ft-font.c: (_cairo_ft_scaled_font_fini):
        * src/cairo-win32-font.c: (_cairo_win32_scaled_font_fini):
        Track rename of scaled_font_backend->fini.


Index: cairo-atsui-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-atsui-font.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- cairo-atsui-font.c	5 Aug 2005 23:44:20 -0000	1.17
+++ cairo-atsui-font.c	6 Aug 2005 00:00:38 -0000	1.18
@@ -213,7 +213,7 @@
 }
 
 static void
-_cairo_atsui_font_destroy_font(void *abstract_font)
+_cairo_atsui_font_fini(void *abstract_font)
 {
     cairo_atsui_font_t *font = abstract_font;
 
@@ -689,7 +689,7 @@
 
 const cairo_scaled_font_backend_t cairo_atsui_scaled_font_backend = {
     _cairo_atsui_font_create_toy,
-    _cairo_atsui_font_destroy_font,
+    _cairo_atsui_font_fini,
     _cairo_atsui_font_font_extents,
     _cairo_atsui_font_text_to_glyphs,
     _cairo_atsui_font_glyph_extents,

Index: cairo-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-font.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- cairo-font.c	5 Aug 2005 23:44:20 -0000	1.63
+++ cairo-font.c	6 Aug 2005 00:00:38 -0000	1.64
@@ -1083,7 +1083,7 @@
 	cairo_font_face_destroy (scaled_font->font_face);
     }
 
-    scaled_font->backend->destroy (scaled_font);
+    scaled_font->backend->fini (scaled_font);
 
     free (scaled_font);
 }

Index: cairo-ft-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-ft-font.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- cairo-ft-font.c	5 Aug 2005 23:44:20 -0000	1.89
+++ cairo-ft-font.c	6 Aug 2005 00:00:38 -0000	1.90
@@ -1507,7 +1507,7 @@
 }
 
 static void 
-_cairo_ft_scaled_font_destroy (void *abstract_font)
+_cairo_ft_scaled_font_fini (void *abstract_font)
 {
     cairo_ft_scaled_font_t *scaled_font = abstract_font;
   
@@ -2028,7 +2028,7 @@
 
 const cairo_scaled_font_backend_t cairo_ft_scaled_font_backend = {
     _cairo_ft_scaled_font_create_toy,
-    _cairo_ft_scaled_font_destroy,
+    _cairo_ft_scaled_font_fini,
     _cairo_ft_scaled_font_font_extents,
     _cairo_ft_scaled_font_text_to_glyphs,
     _cairo_ft_scaled_font_glyph_extents,

Index: cairo-win32-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-win32-font.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- cairo-win32-font.c	5 Aug 2005 23:44:20 -0000	1.34
+++ cairo-win32-font.c	6 Aug 2005 00:00:38 -0000	1.35
@@ -503,7 +503,7 @@
 }
 
 static void 
-_cairo_win32_scaled_font_destroy (void *abstract_font)
+_cairo_win32_scaled_font_fini (void *abstract_font)
 {
     cairo_win32_scaled_font_t *scaled_font = abstract_font;
 
@@ -1272,7 +1272,7 @@
 
 const cairo_scaled_font_backend_t cairo_win32_scaled_font_backend = {
     _cairo_win32_scaled_font_create_toy,
-    _cairo_win32_scaled_font_destroy,
+    _cairo_win32_scaled_font_fini,
     _cairo_win32_scaled_font_font_extents,
     _cairo_win32_scaled_font_text_to_glyphs,
     _cairo_win32_scaled_font_glyph_extents,

Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- cairoint.h	5 Aug 2005 23:44:20 -0000	1.180
+++ cairoint.h	6 Aug 2005 00:00:38 -0000	1.181
@@ -577,7 +577,7 @@
 				      const cairo_font_options_t  *options,
 				      cairo_scaled_font_t	 **font);
     
-    void (*destroy)                   (void		       *font);
+    void (*fini)                     (void		       *font);
 
     cairo_status_t (*font_extents)   (void		       *font,
 				      cairo_font_extents_t     *extents);