From: Kristian Rietveld <kris@gtk.org>
Date: Fri, 19 Mar 2010 09:40:42 +0000 (+0100)
Subject: Really get _pango_cairo_core_text_font_new right
X-Git-Tag: 1.29.1~148
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e658c9e8942468666b72eed97adca595796817c;p=platform%2Fupstream%2Fpango.git

Really get _pango_cairo_core_text_font_new right
---

diff --git a/pango/pangocairo-coretextfont.c b/pango/pangocairo-coretextfont.c
index e73e693..5948752 100644
--- a/pango/pangocairo-coretextfont.c
+++ b/pango/pangocairo-coretextfont.c
@@ -223,7 +223,7 @@ _pango_cairo_core_text_font_new (PangoCairoCoreTextFontMap  *cafontmap,
 
   postscript_name = _pango_core_text_face_get_postscript_name (face);
 
-  abs_size = size = (double) pango_font_description_get_size (desc) / PANGO_SCALE;
+  abs_size = size = pango_units_to_double (pango_font_description_get_size (desc));
 
   if (context)
     {
@@ -236,7 +236,7 @@ _pango_cairo_core_text_font_new (PangoCairoCoreTextFontMap  *cafontmap,
     dpi = cafontmap->dpi;
 
   if (pango_font_description_get_size_is_absolute (desc))
-    size *= dpi / 72.;
+    size *= 72. / dpi;
   else
     abs_size *= dpi / 72.;