From 75f4ad29adce645ddb837e662c9d71ccfbf60154 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 6 Jan 2005 17:40:32 +0000 Subject: Fix reversed test on attr->absolute that was causing pixels sizes to be Thu Jan 6 12:29:31 2005 Owen Taylor * pango/pango-attributes.c (pango_attr_iterator_get_font): Fix reversed test on attr->absolute that was causing pixels sizes to be used inappropriately. (#163105, Ross Burton) --- ChangeLog | 7 +++++++ ChangeLog.pre-1-10 | 7 +++++++ pango/pango-attributes.c | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8bd62053..a2ed4404 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Jan 6 12:29:31 2005 Owen Taylor + + * pango/pango-attributes.c (pango_attr_iterator_get_font): + Fix reversed test on attr->absolute that was causing + pixels sizes to be used inappropriately. (#163105, + Ross Burton) + Tue Jan 4 14:14:28 2005 Owen Taylor * pango/break.c (enum): Fix trailing comma in enum (#162618) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 8bd62053..a2ed4404 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,10 @@ +Thu Jan 6 12:29:31 2005 Owen Taylor + + * pango/pango-attributes.c (pango_attr_iterator_get_font): + Fix reversed test on attr->absolute that was causing + pixels sizes to be used inappropriately. (#163105, + Ross Burton) + Tue Jan 4 14:14:28 2005 Owen Taylor * pango/break.c (enum): Fix trailing comma in enum (#162618) diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c index ddeb4978..3191c029 100644 --- a/pango/pango-attributes.c +++ b/pango/pango-attributes.c @@ -1677,9 +1677,9 @@ pango_attr_iterator_get_font (PangoAttrIterator *iterator, { mask |= PANGO_FONT_MASK_SIZE; if (((PangoAttrSize *)attr)->absolute) - pango_font_description_set_size (desc, ((PangoAttrSize *)attr)->size); - else pango_font_description_set_absolute_size (desc, ((PangoAttrSize *)attr)->size); + else + pango_font_description_set_size (desc, ((PangoAttrSize *)attr)->size); } break; case PANGO_ATTR_SCALE: -- cgit v1.2.1