summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2006-11-22 20:37:45 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2006-11-22 20:37:45 +0000
commite20a876aae772e4a15a53ebb457e3b2b64c705c5 (patch)
treec5a16707cdbcda4c772caa2c27cc7d4e0debe022
parent9e4110ce90a55a2362f6ea0a3c8a36018121b859 (diff)
downloadpango-e20a876aae772e4a15a53ebb457e3b2b64c705c5.tar.gz
Bug 377975 – bug in _pango_glyph_item_iter_next_cluster
2006-11-22 Behdad Esfahbod <behdad@gnome.org> Bug 377975 – bug in _pango_glyph_item_iter_next_cluster * pango/pango-glyph-item.c (_pango_glyph_item_iter_next_cluster), (_pango_glyph_item_iter_prev_cluster): Fix condition for ending a cluster.
-rw-r--r--ChangeLog8
-rw-r--r--pango/pango-glyph-item.c8
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 000cd09d..e89c9289 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-22 Behdad Esfahbod <behdad@gnome.org>
+
+ Bug 377975 – bug in _pango_glyph_item_iter_next_cluster
+
+ * pango/pango-glyph-item.c (_pango_glyph_item_iter_next_cluster),
+ (_pango_glyph_item_iter_prev_cluster): Fix condition for ending a
+ cluster.
+
2006-11-20 Behdad Esfahbod <behdad@gnome.org>
* === Released 1.14.8 ===
diff --git a/pango/pango-glyph-item.c b/pango/pango-glyph-item.c
index 6cfd3826..858dadad 100644
--- a/pango/pango-glyph-item.c
+++ b/pango/pango-glyph-item.c
@@ -193,7 +193,7 @@ _pango_glyph_item_iter_next_cluster (PangoGlyphItemIter *iter)
break;
}
- if (item->offset + glyphs->log_clusters[glyph_index] >= iter->start_index)
+ if (item->offset + glyphs->log_clusters[glyph_index] != iter->start_index)
{
iter->end_index = item->offset + glyphs->log_clusters[glyph_index];
iter->end_char += g_utf8_strlen (iter->text + iter->start_index,
@@ -215,7 +215,7 @@ _pango_glyph_item_iter_next_cluster (PangoGlyphItemIter *iter)
break;
}
- if (item->offset + glyphs->log_clusters[glyph_index] >= iter->start_index)
+ if (item->offset + glyphs->log_clusters[glyph_index] != iter->start_index)
{
iter->end_index = item->offset + glyphs->log_clusters[glyph_index];
iter->end_char += g_utf8_strlen (iter->text + iter->start_index,
@@ -274,7 +274,7 @@ _pango_glyph_item_iter_prev_cluster (PangoGlyphItemIter *iter)
break;
}
- if (item->offset + glyphs->log_clusters[glyph_index] < iter->end_index)
+ if (item->offset + glyphs->log_clusters[glyph_index] != iter->end_index)
{
iter->start_index = item->offset + glyphs->log_clusters[glyph_index];
iter->start_char -= g_utf8_strlen (iter->text + iter->start_index,
@@ -296,7 +296,7 @@ _pango_glyph_item_iter_prev_cluster (PangoGlyphItemIter *iter)
break;
}
- if (item->offset + glyphs->log_clusters[glyph_index] < iter->start_index)
+ if (item->offset + glyphs->log_clusters[glyph_index] != iter->start_index)
{
iter->start_index = item->offset + glyphs->log_clusters[glyph_index];
iter->start_char -= g_utf8_strlen (iter->text + iter->start_index,