[pango] Fix pangocairo-fc fontsize weirdness

[Behdad Esfahbod <behdad src gnome org>]

commit df2d2ecbedfcc9fd470313c08f3d7edad148a0d1
Author: Behdad Esfahbod <behdad behdad org>
Date:   Tue Nov 17 21:09:05 2009 -0500

    Fix pangocairo-fc fontsize weirdness

 pango/pangocairo-fcfont.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c
index 3ac166e..8401ed8 100644
--- a/pango/pangocairo-fcfont.c
+++ b/pango/pangocairo-fcfont.c
@@ -166,7 +166,7 @@ get_font_size (const FcPattern *pattern)
   double dpi;
 
   if (FcPatternGetDouble (pattern, FC_PIXEL_SIZE, 0, &size) == FcResultMatch)
-    return size * PANGO_SCALE;
+    return size;
 
   /* Just in case FC_PIXEL_SIZE got unset between pango_fc_make_pattern()
    * and here.  That would be very weird.
@@ -240,8 +240,7 @@ _pango_cairo_fc_font_new (PangoCairoFcFontMap *cffontmap,
 		     fc_matrix.yy,
 		     0., 0.);
 
-  cairo_matrix_scale (&font_matrix,
-		      size / PANGO_SCALE, size / PANGO_SCALE);
+  cairo_matrix_scale (&font_matrix, size, size);
 
   _pango_cairo_font_private_initialize (&cffont->cf_priv,
 					(PangoCairoFont *) cffont,