From 8e73de47ec13ff14d6c63e59704a74dded72eefa Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 13 Sep 2006 18:45:39 +0000 Subject: =?UTF-8?q?Part=20of=20Bug=20355782=20=E2=80=93=20Misaligned=20ext?= =?UTF-8?q?ents=20in=20pango?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2006-09-13 Behdad Esfahbod Part of Bug 355782 – Misaligned extents in pango * pango/pango-layout.c (pango_layout_iter_copy): Fix typo in copying iter->cluster_width. --- ChangeLog | 7 +++++++ pango/pango-layout.c | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index be504936..2b233cb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-09-13 Behdad Esfahbod + + Part of Bug 355782 – Misaligned extents in pango + + * pango/pango-layout.c (pango_layout_iter_copy): Fix typo in copying + iter->cluster_width. + 2006-09-12 Behdad Esfahbod Bug 355605 – hexbox with 0000 in it diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 22e9bcca..7675e648 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -4602,7 +4602,6 @@ pango_layout_iter_copy (PangoLayoutIter *iter) if (l == iter->line_extents_link) new->line_extents_link = new->line_extents; } - new->line_extents = g_slist_reverse (new->line_extents); new->run_x = iter->run_x; @@ -4610,7 +4609,7 @@ pango_layout_iter_copy (PangoLayoutIter *iter) new->ltr = iter->ltr; new->cluster_x = iter->cluster_x; - new->cluster_width = iter->cluster_x; + new->cluster_width = iter->cluster_width; new->cluster_start = iter->cluster_start; new->next_cluster_glyph = iter->next_cluster_glyph; @@ -4640,7 +4639,8 @@ pango_layout_iter_get_type (void) * * Returns an iterator to iterate over the visual extents of the layout. * - * Return value: the new #PangoLayoutIter. + * Return value: the new #PangoLayoutIter that should be freed using + * pango_layout_iter_free(). **/ PangoLayoutIter* pango_layout_get_iter (PangoLayout *layout) @@ -4672,11 +4672,11 @@ pango_layout_get_iter (PangoLayout *layout) else iter->run = NULL; - iter->line_extents = NULL; + iter->line_extents = NULL; pango_layout_get_extents_internal (layout, NULL, &iter->logical_rect, - &iter->line_extents); + &iter->line_extents); iter->line_extents_link = iter->line_extents; @@ -4819,7 +4819,7 @@ next_nonempty_line (PangoLayoutIter *iter, return result; } -/* Moves to the next non-empty line. If @include_terminators +/* Moves to the next non-empty run. If @include_terminators * is set, the trailing run at the end of a line with an explicit * paragraph separator is considered non-empty. */ -- cgit v1.2.1