whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[QFontEngineBox] Fix incorrect advances for SMP code points 

In UTF-16, SMP code point is encoded with a pair of surrogates,
thus making SMP code point twice wider than BMP code point.

Change-Id: Ifb0e78cff50cca7231d07097a730188bd98c54cb
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
bb10
Konstantin Ritt 2014-01-29 19:52:41 +02:00 committed by The Qt Project
parent e707607ab0
commit d8225fab8f
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/text/qfontengine.cpp
View File

@ -1299,17 +1299,24 @@ QFontEngineBox::~QFontEngineBox()
{
}
bool QFontEngineBox::stringToCMap(const QChar *, int len, QGlyphLayout *glyphs, int *nglyphs, QFontEngine::ShaperFlags flags) const
bool QFontEngineBox::stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, QFontEngine::ShaperFlags flags) const
{
if (*nglyphs < len) {
*nglyphs = len;
return false;
}
memset(glyphs->glyphs, 0, len * sizeof(glyph_t));
int ucs4Length = 0;
for (int i = 0; i < len; ++i) {
if (str[i].isHighSurrogate() && i + 1 < len && str[i + 1].isLowSurrogate())
++ucs4Length;
++ucs4Length;
}
*nglyphs = len;
glyphs->numGlyphs = len;
memset(glyphs->glyphs, 0, ucs4Length * sizeof(glyph_t));
*nglyphs = ucs4Length;
glyphs->numGlyphs = ucs4Length;
if (!(flags & GlyphIndicesOnly))
recalcAdvances(glyphs, flags);