summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2009-11-17 21:09:05 -0500
committerBehdad Esfahbod <behdad@behdad.org>2009-11-17 21:09:05 -0500
commitdf2d2ecbedfcc9fd470313c08f3d7edad148a0d1 (patch)
tree6b46b29cdb93704f1c069459b038f3b28e772b28 /pango
parentd9abcaf566e9cd7f702c98958f99f90fd53b4c0b (diff)
downloadpango-df2d2ecbedfcc9fd470313c08f3d7edad148a0d1.tar.gz
Fix pangocairo-fc fontsize weirdness
Diffstat (limited to 'pango')
-rw-r--r--pango/pangocairo-fcfont.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c
index 3ac166e6..8401ed8d 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,