diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2011-04-15 18:45:24 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2011-04-15 18:45:24 -0400 |
| commit | 9ac5bce958cb2ac500148dcd80c0d2c6877f7e4c (patch) | |
| tree | d2a207b07ae2cedae0ba2f4d007fa7be405b2fb7 /modules | |
| parent | dff1f2b0d6c353f0839a7a38115c69cd915f9cbd (diff) | |
| parent | 08fd5cf33d875c161dd5280b92d1633469943620 (diff) | |
| download | pango-9ac5bce958cb2ac500148dcd80c0d2c6877f7e4c.tar.gz | |
Merge branch 'master' into harfbuzz-ng-external
Conflicts:
pango/opentype/hb-buffer-private.h
pango/opentype/hb-buffer.c
pango/opentype/hb-buffer.h
pango/opentype/hb-open-type-private.hh
pango/opentype/hb-ot-layout-gpos-private.hh
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/hangul/hangul-fc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/hangul/hangul-fc.c b/modules/hangul/hangul-fc.c index 7692a843..2ef56ec9 100644 --- a/modules/hangul/hangul-fc.c +++ b/modules/hangul/hangul-fc.c @@ -338,15 +338,16 @@ render_syllable (PangoFont *font, const char *str, int length, oldlen = *n_glyphs; for (j = 0; j < 3 && (__jamo_to_ksc5601[jindex][j] != 0); j++) { - wc = __jamo_to_ksc5601[jindex][j] - KSC_JAMOBASE + UNI_JAMOBASE; - index = (wc >= 0x3131) ? find_char (font, wc) : 0; + gunichar comp_wc; + comp_wc = __jamo_to_ksc5601[jindex][j] - KSC_JAMOBASE + UNI_JAMOBASE; + index = (comp_wc >= 0x3131) ? find_char (font, comp_wc) : 0; pango_glyph_string_set_size (glyphs, *n_glyphs + 1); if (!index) { *n_glyphs = oldlen; pango_glyph_string_set_size (glyphs, *n_glyphs + 1); set_glyph (font, glyphs, *n_glyphs, cluster_offset, - PANGO_GET_UNKNOWN_GLYPH (text[i])); + PANGO_GET_UNKNOWN_GLYPH (wc)); (*n_glyphs)++; break; } |