pango r2803 - in trunk: . pango

[behdad svn gnome org]

Author: behdad
Date: Wed Jan 28 22:07:30 2009
New Revision: 2803
URL: http://svn.gnome.org/viewvc/pango?rev=2803&view=rev

Log:
2009-01-09  Behdad Esfahbod  <behdad gnome org>

        * pango/pangocairo-atsuifont.c (_pango_cairo_atsui_font_new):
        * pango/pangocairo-fcfont.c (_pango_cairo_fc_font_new):
        * pango/pangocairo-font.c (_pango_cairo_font_private_initialize):
        * pango/pangocairo-private.h:
        * pango/pangocairo-win32font.c (_pango_cairo_win32_font_new):
        Remove desc argument from _pango_cairo_font_private_initialize().
        Replace it with gravity, the only thing from desc we actually needed.
        This is in preparation for lazy loading of fonts in the pangofc fontmap.

Modified:
   trunk/ChangeLog
   trunk/pango/pangocairo-atsuifont.c
   trunk/pango/pangocairo-fcfont.c
   trunk/pango/pangocairo-font.c
   trunk/pango/pangocairo-private.h
   trunk/pango/pangocairo-win32font.c

Modified: trunk/pango/pangocairo-atsuifont.c
==============================================================================
--- trunk/pango/pangocairo-atsuifont.c	(original)
+++ trunk/pango/pangocairo-atsuifont.c	Wed Jan 28 22:07:30 2009
@@ -308,7 +308,7 @@
 
   _pango_cairo_font_private_initialize (&cafont->cf_priv,
 					(PangoCairoFont *) cafont,
-					desc,
+					pango_font_description_get_gravity (desc),
 					_pango_cairo_context_get_merged_font_options (context),
 					pango_context_get_matrix (context),
 					&font_matrix);

Modified: trunk/pango/pangocairo-fcfont.c
==============================================================================
--- trunk/pango/pangocairo-fcfont.c	(original)
+++ trunk/pango/pangocairo-fcfont.c	Wed Jan 28 22:07:30 2009
@@ -244,7 +244,7 @@
 
   _pango_cairo_font_private_initialize (&cffont->cf_priv,
 					(PangoCairoFont *) cffont,
-					desc,
+					pango_font_description_get_gravity (desc),
 					_pango_cairo_context_get_merged_font_options (context),
 					pango_context_get_matrix (context),
 					&font_matrix);

Modified: trunk/pango/pangocairo-font.c
==============================================================================
--- trunk/pango/pangocairo-font.c	(original)
+++ trunk/pango/pangocairo-font.c	Wed Jan 28 22:07:30 2009
@@ -515,7 +515,7 @@
 void
 _pango_cairo_font_private_initialize (PangoCairoFontPrivate      *cf_priv,
 				      PangoCairoFont             *cfont,
-				      const PangoFontDescription *desc,
+				      PangoGravity                gravity,
 				      const cairo_font_options_t *font_options,
 				      const PangoMatrix          *pango_ctm,
 				      const cairo_matrix_t       *font_matrix)
@@ -523,7 +523,7 @@
   cairo_matrix_t gravity_matrix;
 
   cf_priv->cfont = cfont;
-  cf_priv->gravity = pango_font_description_get_gravity (desc);
+  cf_priv->gravity = gravity;
 
   cf_priv->data = _pango_cairo_font_private_scaled_font_data_create (); 
 

Modified: trunk/pango/pangocairo-private.h
==============================================================================
--- trunk/pango/pangocairo-private.h	(original)
+++ trunk/pango/pangocairo-private.h	Wed Jan 28 22:07:30 2009
@@ -109,7 +109,7 @@
 
 void _pango_cairo_font_private_initialize (PangoCairoFontPrivate      *cf_priv,
 					   PangoCairoFont             *font,
-					   const PangoFontDescription *desc,
+					   PangoGravity                gravity,
 					   const cairo_font_options_t *font_options,
 					   const PangoMatrix          *pango_ctm,
 					   const cairo_matrix_t       *font_matrix);

Modified: trunk/pango/pangocairo-win32font.c
==============================================================================
--- trunk/pango/pangocairo-win32font.c	(original)
+++ trunk/pango/pangocairo-win32font.c	Wed Jan 28 22:07:30 2009
@@ -318,7 +318,7 @@
 
   _pango_cairo_font_private_initialize (&cwfont->cf_priv,
 					(PangoCairoFont *) cwfont,
-					desc,
+					pango_font_description_get_gravity (desc),
 					_pango_cairo_context_get_merged_font_options (context),
 					pango_context_get_matrix (context),
 					&font_matrix);