[cairo-commit] cairo/src cairoint.h,1.181,1.182

[Carl Worth]

Committed by: cworth

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

Modified Files:
	cairoint.h 
Log Message:

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

        * src/cairoint.h: Rename parameters to scalend_font_backend from
        font to scaled_font.


Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -d -r1.181 -r1.182
--- cairoint.h	6 Aug 2005 00:00:38 -0000	1.181
+++ cairoint.h	6 Aug 2005 00:27:57 -0000	1.182
@@ -575,29 +575,29 @@
 				      const cairo_matrix_t	  *font_matrix,
 				      const cairo_matrix_t	  *ctm,
 				      const cairo_font_options_t  *options,
-				      cairo_scaled_font_t	 **font);
+				      cairo_scaled_font_t	 **scaled_font);
     
-    void (*fini)                     (void		       *font);
+    void (*fini)                     (void		       *scaled_font);
 
-    cairo_status_t (*font_extents)   (void		       *font,
+    cairo_status_t (*font_extents)   (void		       *scaled_font,
 				      cairo_font_extents_t     *extents);
 
-    cairo_status_t (*text_to_glyphs) (void                     *font,
+    cairo_status_t (*text_to_glyphs) (void                     *scaled_font,
 				      const char	       *utf8,
 				      cairo_glyph_t	      **glyphs, 
 				      int		       *num_glyphs);
 
-    cairo_status_t (*glyph_extents)  (void		       *font,
+    cairo_status_t (*glyph_extents)  (void		       *scaled_font,
 				      cairo_glyph_t	       *glyphs, 
 				      int			num_glyphs,
 				      cairo_text_extents_t     *extents);
 
-    cairo_status_t (*glyph_bbox)    (void		       *font,
+    cairo_status_t (*glyph_bbox)    (void		       *scaled_font,
 				     const cairo_glyph_t       *glyphs,
 				     int			num_glyphs,
 				     cairo_box_t	       *bbox);
   
-    cairo_status_t (*show_glyphs)    (void		       *font,
+    cairo_status_t (*show_glyphs)    (void		       *scaled_font,
 				      cairo_operator_t		operator,
 				      cairo_pattern_t	       *pattern,
 				      cairo_surface_t          *surface,
@@ -610,11 +610,12 @@
 				      const cairo_glyph_t      *glyphs,
 				      int			num_glyphs);
   
-    cairo_status_t (*glyph_path)     (void		       *font,
+    cairo_status_t (*glyph_path)     (void		       *scaled_font,
 				      cairo_glyph_t	       *glyphs, 
 				      int			num_glyphs,
 				      cairo_path_fixed_t       *path);
-    void (*get_glyph_cache_key)      (void                     *font,
+
+    void (*get_glyph_cache_key)      (void                     *scaled_font,
 				      cairo_glyph_cache_key_t  *key);
 };