diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-02-17 08:11:02 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-02-17 08:11:02 +0000 |
| commit | a8f4e10b37a927543dfebe1a37a4d33463a209fc (patch) | |
| tree | 85f717fea18ddcc9eadb46e8e1225e07b6e8ba68 | |
| parent | a8de81b4d9bc9bf432ce8e194c28bb620faf18dc (diff) | |
| download | pango-a8f4e10b37a927543dfebe1a37a4d33463a209fc.tar.gz | |
Bug 329148 – pango_glyph_item_split: assertion `split_index > 0' failed
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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | examples/renderdemo.c | 1 | ||||
| -rw-r--r-- | pango/ellipsize.c | 1 |
3 files changed, 7 insertions, 1 deletions
@@ -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++) { |