From 58e1112a6a974b96bb8595e3ee9d08e915d4fd14 Mon Sep 17 00:00:00 2001 From: László Németh Date: Fri, 6 Sep 2013 15:46:58 +0200 Subject: fdo#52540 fix Graphite hyphenation (ligat. + combining diac.) Change-Id: Idc3d9c40793f6f1c1b7883ca47f04ced36cabc48 --- vcl/source/glyphs/graphite_layout.cxx | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'vcl/source/glyphs/graphite_layout.cxx') diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index e61da7c75c34..348c4e36cbcc 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -589,18 +589,9 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs) nSegCharLimit - rArgs.mnEndCharPos, bRtl); } } - int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + mnSegCharOffset, - rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 : rArgs.mnLength), NULL); - if (mnSegCharOffset + numchars > limit) - { - int combining_char = 0; - for (int i = mnSegCharOffset; i < numchars; i++) { - int ch = rArgs.mpStr[i]; - if ((ch >= 0x300 && ch <= 0x36F) || (ch >= 0x1DC0 && ch <= 0x1DFF) || - (ch >= 0x20D0 && ch <= 0x20F0) || (ch >= 0xFE20 && ch <= 0xFE26)) combining_char++; - } - numchars = limit - mnSegCharOffset + combining_char; // fdo#52540, fdo#68313 - } +// int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + mnSegCharOffset, +// rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 : rArgs.mnLength), NULL); + int numchars = rArgs.mnEndCharPos - mnSegCharOffset; // fdo#52540, fdo#68313, FIXME if (mpFeatures) pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures->values(), gr_utf16, rArgs.mpStr + mnSegCharOffset, numchars, bRtl); -- cgit v1.2.3