From 5bf192caba07684c4fda7a230e4d1afb5ed49664 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Wed, 15 Aug 2012 17:40:00 +0800 Subject: [PATCH] Fix last change to xg_get_font. * gtkutil.c (xg_get_font): Use pango_units_to_double. --- src/ChangeLog | 4 ++++ src/gtkutil.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index dc08d00202..e45b4de48d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Dmitry Antipov + + * gtkutil.c (xg_get_font): Use pango_units_to_double. + 2012-08-15 Chong Yidong * gtkutil.c (xg_get_font): Rename from xg_get_font_name. When diff --git a/src/gtkutil.c b/src/gtkutil.c index 2c9a1377dc..194a104495 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -2101,15 +2101,15 @@ xg_get_font (FRAME_PTR f, const char *default_name) { Lisp_Object args[8]; const char *name = pango_font_description_get_family (desc); + gint size = pango_font_description_get_size (desc); PangoWeight weight = pango_font_description_get_weight (desc); - PangoStyle style = pango_font_description_get_style (desc); + PangoStyle style = pango_font_description_get_style (desc); args[0] = QCname; args[1] = build_string (name); args[2] = QCsize; - args[3] = make_float (((double) pango_font_description_get_size (desc)) - / PANGO_SCALE); + args[3] = make_float (pango_units_to_double (size)); args[4] = QCweight; args[5] = XG_WEIGHT_TO_SYMBOL (weight); -- 2.20.1