Fix CoreText font scaling again

This partially reverts 25ad29b488d3e2ae10e4fee25602409fa39207f1
which itself was a revert.  Apparently we want the change in
CoreText, but not on Win32...

See mailing list discussion.

diff --git a/pango/pangocairo-coretextfont.c b/pango/pangocairo-coretextfont.c
index 290a5cc..0f2a9ef 100644 (file)
--- a/pango/pangocairo-coretextfont.c
+++ b/pango/pangocairo-coretextfont.c
@@ -220,6 +220,8 @@ _pango_cairo_core_text_font_new (PangoCairoCoreTextFontMap  *cafontmap,
   abs_size = pango_core_text_font_key_get_absolute_size (key);
   size = pango_units_to_double (abs_size);
 
+  size /= pango_matrix_get_font_scale_factor (pango_core_text_font_key_get_matrix (key));
+
   ctdescriptor = pango_core_text_font_key_get_ctfontdescriptor (key);
   font_ref = CTFontCreateWithFontDescriptor (ctdescriptor, size, NULL);