diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-01-06 17:40:32 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-01-06 17:40:32 +0000 |
| commit | 75f4ad29adce645ddb837e662c9d71ccfbf60154 (patch) | |
| tree | 9385bd5e16309ea24baaacc532375d5614d14246 | |
| parent | 565464d67374c649287821c918c18aa581e4f930 (diff) | |
| download | pango-75f4ad29adce645ddb837e662c9d71ccfbf60154.tar.gz | |
Fix reversed test on attr->absolute that was causing pixels sizes to be
Thu Jan 6 12:29:31 2005 Owen Taylor <otaylor@redhat.com>
* 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)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 7 | ||||
| -rw-r--r-- | pango/pango-attributes.c | 4 |
3 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Thu Jan 6 12:29:31 2005 Owen Taylor <otaylor@redhat.com> + + * 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 <otaylor@redhat.com> * 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 <otaylor@redhat.com> + + * 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 <otaylor@redhat.com> * 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: |