Author: spouliot
Date: 2007-04-02 10:36:56 -0400 (Mon, 02 Apr 2007)
New Revision: 75280

Modified:
   trunk/libgdiplus/src/ChangeLog
   trunk/libgdiplus/src/font.c
   trunk/libgdiplus/src/graphics.c
Log:
2007-04-02  Sebastien Pouliot  <[EMAIL PROTECTED]>

        * font.c: Change some functions to static and remove unused function.
        * graphics.c: Remove unused externs.



Modified: trunk/libgdiplus/src/ChangeLog
===================================================================
--- trunk/libgdiplus/src/ChangeLog      2007-04-02 12:40:28 UTC (rev 75279)
+++ trunk/libgdiplus/src/ChangeLog      2007-04-02 14:36:56 UTC (rev 75280)
@@ -1,3 +1,8 @@
+2007-04-02  Sebastien Pouliot  <[EMAIL PROTECTED]>
+
+       * font.c: Change some functions to static and remove unused function.
+       * graphics.c: Remove unused externs.
+
 2007-03-30  Sebastien Pouliot  <[EMAIL PROTECTED]>
 
        * jpegcodec.c: Ensure we throw the "right" exception on the managed

Modified: trunk/libgdiplus/src/font.c
===================================================================
--- trunk/libgdiplus/src/font.c 2007-04-02 12:40:28 UTC (rev 75279)
+++ trunk/libgdiplus/src/font.c 2007-04-02 14:36:56 UTC (rev 75280)
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2004 Ximian
- * Copyright (c) 2004-2006 Novell, Inc.
+ * Copyright (c) 2004-2007 Novell, Inc.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a 
copy of this software 
  * and associated documentation files (the "Software"), to deal in the 
Software without restriction, 
@@ -41,7 +41,7 @@
 
 /* Family and collections font functions */
 
-void
+static void
 gdip_createFontFamily (GpFontFamily **family)
 {
        GpFontFamily *result = (GpFontFamily *) GdipAlloc (sizeof 
(GpFontFamily));
@@ -203,7 +203,7 @@
        return Ok;
 }
 
-void
+static void
 gdip_createPrivateFontSet (GpFontCollection *font_collection)
 {
        FcObjectSet *os = FcObjectSetBuild (FC_FAMILY, FC_FOUNDRY, NULL);
@@ -359,8 +359,8 @@
        return status;
 }
 
-static
-gboolean free_cached_pattern (gpointer key, gpointer value, gpointer user)
+static gboolean
+free_cached_pattern (gpointer key, gpointer value, gpointer user)
 {
        g_free (key);
        FcPatternDestroy ((FcPattern*) value);
@@ -516,7 +516,7 @@
        return status;
 }
 
-FT_Face
+static FT_Face
 gdip_cairo_ft_font_lock_face (cairo_font_face_t *cairofnt, cairo_scaled_font_t 
**scaled_ft)
 {
        FT_Face face;
@@ -547,7 +547,7 @@
        return face;
 }
 
-void
+static void
 gdip_cairo_ft_font_unlock_face (cairo_scaled_font_t* scaled_ft)
 {
        cairo_ft_scaled_font_unlock_face (scaled_ft);
@@ -718,7 +718,7 @@
 }
 
 /* Font functions */
-cairo_font_face_t *
+static cairo_font_face_t*
 gdip_face_create (const char *family, 
                        cairo_font_slant_t   slant, 
                        cairo_font_weight_t  weight,
@@ -733,7 +733,6 @@
        face = cairo_get_font_face (*ct);
        cairo_surface_destroy (surface);
        return face;
-
 }
 
 // coverity[+alloc : arg-*4]
@@ -974,8 +973,8 @@
        return gdip_logfont_from_font (font, graphics, lf, FALSE);
 }
 
-GpStatus
-gdip_create_font_from_logfont(void *hdc, void *lf, GpFont **font, bool ucs2)
+static GpStatus
+gdip_create_font_from_logfont (void *hdc, void *lf, GpFont **font, bool ucs2)
 {
        GpFont                  *result;
        cairo_font_face_t       *face;
@@ -1091,28 +1090,6 @@
        return result ? Ok : FileNotFound;
 }
 
-
-bool
-GetFontMetrics(GpGraphics *graphics, GpFont *font, int *ascent, int *descent)
-{
-       cairo_font_extents_t    font_extent;
-
-       cairo_set_font_face (graphics->ct, (cairo_font_face_t*) font->cairofnt);
-       cairo_set_font_size (graphics->ct, font->sizeInPixels);
-       cairo_font_extents (graphics->ct, &font_extent);
-
-       if (ascent) {
-               *ascent = (int)font_extent.ascent;
-       }
-
-       if (descent) {
-               *descent = (int)font_extent.descent;
-       }
-
-       return TRUE;
-}
-
-
 GpStatus
 GdipGetFontHeight (GDIPCONST GpFont *font, GDIPCONST GpGraphics *graphics, 
float *height)
 {

Modified: trunk/libgdiplus/src/graphics.c
===================================================================
--- trunk/libgdiplus/src/graphics.c     2007-04-02 12:40:28 UTC (rev 75279)
+++ trunk/libgdiplus/src/graphics.c     2007-04-02 14:36:56 UTC (rev 75280)
@@ -33,8 +33,6 @@
 #include <math.h>
 #include <glib.h>
 
-extern FT_Face gdip_cairo_ft_font_lock_face (cairo_font_face_t *cairofnt);
-extern void gdip_cairo_ft_font_unlock_face (cairo_font_face_t *cairofnt);
 void gdip_set_cairo_clipping (GpGraphics *graphics);
 
 #define        NO_CAIRO_AA

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to