summaryrefslogtreecommitdiff
path: root/vcl/generic/glyphs/gcach_layout.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-17 13:34:17 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-17 13:34:17 +0100
commit0a73e77b65510b79b653ca13bcf5ebc9a9ddc6c4 (patch)
tree5804bdc5664104ec4d77ad6b4cc2a5342f583f47 /vcl/generic/glyphs/gcach_layout.cxx
parent618463a450fe5bd318dc1bb552980f090ae3caef (diff)
Don't assume sal_Unicode is unsigned short
Change-Id: I3266bb049be3a9b558b68b40d741efdcab2eb759
Diffstat (limited to 'vcl/generic/glyphs/gcach_layout.cxx')
-rw-r--r--vcl/generic/glyphs/gcach_layout.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index 83498f6bb8d5..38ea6accb218 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -483,7 +483,9 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
hb_buffer_set_script(pHbBuffer, maHbScript);
hb_buffer_set_language(pHbBuffer, hb_language_from_string(sLanguage.getStr(), -1));
hb_buffer_set_flags(pHbBuffer, (hb_buffer_flags_t) nHbFlags);
- hb_buffer_add_utf16(pHbBuffer, pStr, nLength, nMinRunPos, nRunLen);
+ hb_buffer_add_utf16(
+ pHbBuffer, reinterpret_cast<uint16_t const *>(pStr), nLength,
+ nMinRunPos, nRunLen);
hb_shape(pHbFont, pHbBuffer, nullptr, 0);
int nRunGlyphCount = hb_buffer_get_length(pHbBuffer);