summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-1-106
-rw-r--r--pango/pango-layout.c2
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 235bd3ba..5a808fb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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);