diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 7 | ||||
| -rw-r--r-- | pango/pango-glyph-item.c | 4 |
6 files changed, 32 insertions, 7 deletions
@@ -1,7 +1,12 @@ -Thu May 29 19:16:38 2003 Owen Taylor <otaylor@redhat.com> +Thu May 29 20:05:45 2003 Owen Taylor <otaylor@redhat.com> * === Released 1.2.2 === + * pango/pango-glyph-item.c: Fix a stupid bug in the + shortcircuit case. + +Thu May 29 19:16:38 2003 Owen Taylor <otaylor@redhat.com> + * configure.in: Up version to 1.2.2. * NEWS: Updated. diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 3fcc8740..236e752b 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,7 +1,12 @@ -Thu May 29 19:16:38 2003 Owen Taylor <otaylor@redhat.com> +Thu May 29 20:05:45 2003 Owen Taylor <otaylor@redhat.com> * === Released 1.2.2 === + * pango/pango-glyph-item.c: Fix a stupid bug in the + shortcircuit case. + +Thu May 29 19:16:38 2003 Owen Taylor <otaylor@redhat.com> + * configure.in: Up version to 1.2.2. * NEWS: Updated. diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 3fcc8740..236e752b 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,7 +1,12 @@ -Thu May 29 19:16:38 2003 Owen Taylor <otaylor@redhat.com> +Thu May 29 20:05:45 2003 Owen Taylor <otaylor@redhat.com> * === Released 1.2.2 === + * pango/pango-glyph-item.c: Fix a stupid bug in the + shortcircuit case. + +Thu May 29 19:16:38 2003 Owen Taylor <otaylor@redhat.com> + * configure.in: Up version to 1.2.2. * NEWS: Updated. diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 3fcc8740..236e752b 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,7 +1,12 @@ -Thu May 29 19:16:38 2003 Owen Taylor <otaylor@redhat.com> +Thu May 29 20:05:45 2003 Owen Taylor <otaylor@redhat.com> * === Released 1.2.2 === + * pango/pango-glyph-item.c: Fix a stupid bug in the + shortcircuit case. + +Thu May 29 19:16:38 2003 Owen Taylor <otaylor@redhat.com> + * configure.in: Up version to 1.2.2. * NEWS: Updated. diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 3fcc8740..236e752b 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,7 +1,12 @@ -Thu May 29 19:16:38 2003 Owen Taylor <otaylor@redhat.com> +Thu May 29 20:05:45 2003 Owen Taylor <otaylor@redhat.com> * === Released 1.2.2 === + * pango/pango-glyph-item.c: Fix a stupid bug in the + shortcircuit case. + +Thu May 29 19:16:38 2003 Owen Taylor <otaylor@redhat.com> + * configure.in: Up version to 1.2.2. * NEWS: Updated. diff --git a/pango/pango-glyph-item.c b/pango/pango-glyph-item.c index a18dd0d9..c1b40aa9 100644 --- a/pango/pango-glyph-item.c +++ b/pango/pango-glyph-item.c @@ -319,6 +319,8 @@ pango_glyph_item_apply_attrs (PangoGlyphItem *glyph_item, g_assert (pango_attr_iterator_next (iter)); } + state.segment_attrs = pango_attr_iterator_get_attrs (iter); + /* Short circuit the case when we don't actually need to * split the item */ @@ -326,8 +328,6 @@ pango_glyph_item_apply_attrs (PangoGlyphItem *glyph_item, range_end >= glyph_item->item->offset + glyph_item->item->length) goto out; - state.segment_attrs = pango_attr_iterator_get_attrs (iter); - while (TRUE) { /* Find the next logical cluster; [range_start,range_end] |