summaryrefslogtreecommitdiff
path: root/modules/arabic
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2004-03-02 00:59:01 +0000
committerOwen Taylor <otaylor@src.gnome.org>2004-03-02 00:59:01 +0000
commit37fd4baefa4ba074d2381116008f244dfe90edce (patch)
tree75b448494e1e8d9b183bbf223cc02b2f0ddd3e3c /modules/arabic
parentaf095f2b80d62ebbe8dbd3a212f20a2ca2c3b7c7 (diff)
downloadpango-37fd4baefa4ba074d2381116008f244dfe90edce.tar.gz
=== Released 1.3.5 ===PANGO_1_3_5
Mon Mar 1 19:24:09 2004 Owen Taylor <otaylor@redhat.com> * === Released 1.3.5 === * configure.in: Version 1.3.5 (1.3.4 skipped), interface age 0. * NEWS: Update * modules/arabic/arabic-fc.c (arabic_engine_shape): Fix a crash from left-over handling of clusters for non-spacing marks.
Diffstat (limited to 'modules/arabic')
-rw-r--r--modules/arabic/arabic-fc.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/modules/arabic/arabic-fc.c b/modules/arabic/arabic-fc.c
index bf0270c9..b7be54d0 100644
--- a/modules/arabic/arabic-fc.c
+++ b/modules/arabic/arabic-fc.c
@@ -291,6 +291,7 @@ arabic_engine_shape (PangoEngineShape *engine,
PangoGlyph index;
char buf[6];
const char *input;
+ int cluster = 0;
wc = g_utf8_get_char (p);
@@ -328,14 +329,11 @@ arabic_engine_shape (PangoEngineShape *engine,
}
else
{
+ if (g_unichar_type (wc) != G_UNICODE_NON_SPACING_MARK)
+ cluster = p - text;
+
pango_ot_buffer_add_glyph (buffer, index,
- properties[i], p - text);
-
- if (g_unichar_type (wc) == G_UNICODE_NON_SPACING_MARK)
- {
- if (i > 0)
- glyphs->log_clusters[i] = glyphs->log_clusters[i-1];
- }
+ properties[i], cluster);
}
}