diff options
| author | László Németh <nemeth@numbertext.org> | 2013-09-06 11:20:09 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2013-11-05 12:13:52 +0100 |
| commit | 224876cca06663be6e1fdfb092ec7ba6ae1d4a5d (patch) | |
| tree | 09980bb53887ba4678c0408c0d13890228e3db37 | |
| parent | f6d5a0e7bbd54c7a6c09eea9d1fa7f1f04020664 (diff) | |
fdo#68313 fix combining diacritics problem with Graphite fonts
Change-Id: I042a32cc9c025efcd25ccf95427bee5d6d4024fb
| -rw-r--r-- | vcl/source/glyphs/graphite_layout.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index 1190408d66e1..bbd7cc56e512 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -594,9 +594,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 (rArgs.mnMinCharPos + numchars > limit) numchars = limit - rArgs.mnMinCharPos; // fdo#52540 +// 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); |