diff options
| author | László Németh <nemeth@numbertext.org> | 2013-09-06 11:08:02 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2013-09-06 16:02:29 +0200 |
| commit | bb09c7c14bb1caf7b08b39944bda61382b158c64 (patch) | |
| tree | 075bbaf464140a2fb7f99c2699b1e2b353218442 /vcl | |
| parent | cf13e4cfaa6de93b746c93d7a677224f56b0eeb4 (diff) | |
fdo#68313 fix combining diacritics problem with Graphite fonts
Change-Id: Ied29f864dc5fc21fc55aaa5ddd40b02b53a564f8
Diffstat (limited to 'vcl')
| -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 034842afdd21..a9cb7cc4e21b 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -589,9 +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 (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); |