summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--examples/renderdemo.c1
-rw-r--r--pango/ellipsize.c1
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c73dcda5..0c26939b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-02-17 Behdad Esfahbod <behdad@gnome.org>
+ Bug 329148 – pango_glyph_item_split: assertion `split_index > 0' failed
+
+ * pango/ellipsize.c (init_state): Do not mistakenly set start_offset = 0.
+
+2006-02-17 Behdad Esfahbod <behdad@gnome.org>
+
* pango/pango-types.h, pango/pango-font.h: Move PANGO_GLYPH_EMPTY,
PANGO_GLYPH_UNKNOWN_FLAG, and PANGO_GET_UNKNOWN_GLYPH from the former
to the latter, and only define if PANGO_ENABLE_ENGINE or
diff --git a/examples/renderdemo.c b/examples/renderdemo.c
index 76cea9a8..52e911bf 100644
--- a/examples/renderdemo.c
+++ b/examples/renderdemo.c
@@ -215,6 +215,7 @@ output_body (PangoContext *context,
(*render_cb) (layout, x, y+*height, cb_context, cb_data);
*width = MAX (*width, PANGO_PIXELS (logical_rect.x + logical_rect.width));
+ *width = MAX (*width, PANGO_PIXELS (pango_layout_get_width (layout)));
*height += PANGO_PIXELS (logical_rect.height);
g_object_unref (layout);
diff --git a/pango/ellipsize.c b/pango/ellipsize.c
index 50b019aa..a8ac04c9 100644
--- a/pango/ellipsize.c
+++ b/pango/ellipsize.c
@@ -126,7 +126,6 @@ init_state (EllipsizeState *state,
start_offset = g_utf8_strlen (line->layout->text,
line->start_index);
- start_offset = 0;
state->total_width = 0;
for (l = line->runs, i = 0; l; l = l->next, i++)
{