[cairo-commit] cairo/src cairo-ft-font.c,1.99,1.100

[Carl Worth]

Committed by: cworth

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

Modified Files:
	cairo-ft-font.c 
Log Message:

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

        Minor, cosmetic changes:

        * src/cairo-ft-font.c: (_cairo_ft_unscaled_font_lock_face): Reowrd
        comment to be more clear.

        * src/cairo-ft-font.c: (_cairo_ft_scaled_font_create): Prefer
        return of address of base field rather than cast.

        * src/cairo-ft-font.c: (_cairo_ft_font_face_destroy): Whitespace
        fix.



Index: cairo-ft-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-ft-font.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- cairo-ft-font.c	13 Aug 2005 09:02:39 -0000	1.99
+++ cairo-ft-font.c	13 Aug 2005 09:21:07 -0000	1.100
@@ -487,7 +487,7 @@
 	return unscaled->face;
     }
 
-    /* If the unscaled font was created from an FT_Face then we just
+    /* If this unscaled font was created from an FT_Face then we just
      * returned it above. */
     assert (!unscaled->from_face);
     
@@ -1460,7 +1460,7 @@
 
     scaled_font->load_flags = load_flags;
 
-    return (cairo_scaled_font_t*) scaled_font;
+    return &scaled_font->base;
 }
 
 cairo_bool_t
@@ -2202,7 +2202,8 @@
 
     if (font_face->unscaled &&
 	font_face->unscaled->from_face &&
-	font_face->unscaled->base.ref_count > 1) {
+	font_face->unscaled->base.ref_count > 1)
+    {
 	cairo_font_face_reference (&font_face->base);
 	
 	_cairo_unscaled_font_destroy (&font_face->unscaled->base);