From 2abe0fc819264649a9cd503180ec6b558cf80b20 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 31 Oct 2003 17:40:24 +0000 Subject: Fix one problem with iteration by chars (Part of #89541, Mariano MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fri Oct 31 12:32:38 2003 Owen Taylor Fix one problem with iteration by chars (Part of #89541, Mariano Suárez-Alvarez) * Pango/pango-layout.c (cluster_end_index): Fix to be item relative, like iter->cluster_index. * pango/pango-layout.c (pango_layout_iter_next_char): Adapt. --- pango/pango-layout.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pango') diff --git a/pango/pango-layout.c b/pango/pango-layout.c index e620967c..0d5c501a 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -3954,13 +3954,13 @@ cluster_end_index (PangoLayoutIter *iter) { /* Use the left or right end of the run */ if (iter->ltr) - return iter->run->item->offset + iter->run->item->length; + return iter->run->item->length; else - return iter->run->item->offset; + return 0; } else { - return iter->run->item->offset + gs->log_clusters[iter->next_cluster_start]; + return gs->log_clusters[iter->next_cluster_start]; } } @@ -4213,7 +4213,7 @@ pango_layout_iter_next_char (PangoLayoutIter *iter) gs = iter->run->glyphs; - next_cluster_index = cluster_end_index (iter); + next_cluster_index = iter->run->item->offset + cluster_end_index (iter); oldp = iter->layout->text + iter->index; -- cgit v1.2.1