diff options
| author | Tor Lillqvist <tml@novell.com> | 2008-02-25 01:26:22 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2008-02-25 01:26:22 +0000 |
| commit | bb310c6a105e181ceb1699beecfab2f752e30176 (patch) | |
| tree | 7e66f5e26df7240177f1be27d71b3cf8c01cc701 /modules | |
| parent | 086da399d3c16f0c9b75ae2c60e4afcb286bb052 (diff) | |
| download | pango-bb310c6a105e181ceb1699beecfab2f752e30176.tar.gz | |
Bug 515484 -- Uniscribe interface handles surrogate pairs incorrectly
2008-02-25 Tor Lillqvist <tml@novell.com>
Bug 515484 -- Uniscribe interface handles surrogate
pairs incorrectly
* modules/basic/basic-win32.c (itemize_shape_and_place): Pass
correctly offset wchar string to set_up_pango_log_clusters() so
that when it passes the string on to unichar_index() it notices
the surrogate pairs correctly.
svn path=/trunk/; revision=2574
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/basic/basic-win32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/basic/basic-win32.c b/modules/basic/basic-win32.c index c0880fb8..f11b34a2 100644 --- a/modules/basic/basic-win32.c +++ b/modules/basic/basic-win32.c @@ -367,7 +367,7 @@ dump_glyphs_and_log_clusters (gboolean rtl, static int unichar_index (wchar_t *wtext, - int ix) + int ix) { int i, index; @@ -606,7 +606,7 @@ itemize_shape_and_place (PangoFont *font, ng = glyphs->num_glyphs; pango_glyph_string_set_size (glyphs, ng + nglyphs); - set_up_pango_log_clusters (wtext, + set_up_pango_log_clusters (wtext + items[item].iCharPos, items[item].a.fRTL, itemlen, log_clusters, nglyphs, glyphs->log_clusters + ng, char_offset); |