diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-08-15 15:45:46 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-08-15 15:45:46 +0000 |
| commit | bb7216ad5a09bbdc5fd1d8f6b87d16ea0a52346c (patch) | |
| tree | 8b30a54312f3133623bf6d24b5812494d4882201 | |
| parent | abc342e51e6c23a7c1ff28a3a61b11d93f64f5f1 (diff) | |
| download | pango-bb7216ad5a09bbdc5fd1d8f6b87d16ea0a52346c.tar.gz | |
Fix unconditional access to logical_rect. (#312691, Hans Breuer)
2005-08-15 Owen Taylor <otaylor@redhat.com>
* pango/pango-layout.c (pango_layout_line_get_extents):
Fix unconditional access to logical_rect. (#312691,
Hans Breuer)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | pango/pango-layout.c | 2 |
3 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2005-08-15 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (pango_layout_line_get_extents): + Fix unconditional access to logical_rect. (#312691, + Hans Breuer) + 2005-08-15 Tor Lillqvist <tml@novell.com> * pango/pango.def: Add pango_item_get_type and diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 235bd3ba..5a808fb3 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +2005-08-15 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (pango_layout_line_get_extents): + Fix unconditional access to logical_rect. (#312691, + Hans Breuer) + 2005-08-15 Tor Lillqvist <tml@novell.com> * pango/pango.def: Add pango_item_get_type and diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 933d9f48..45e1e2ed 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -4000,7 +4000,7 @@ pango_layout_line_get_extents (PangoLayoutLine *line, tmp_list = tmp_list->next; } - if (!line->runs) + if (logical_rect && !line->runs) { PangoRectangle temp_rect; pango_layout_line_get_empty_extents (line, &temp_rect); |