diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-05-07 23:57:34 (GMT) |
|---|---|---|
| committer | Ashish Kulkarni <kulkarni.ashish@gmail.com> | 2014-12-13 17:28:16 (GMT) |
| commit | 3985dfb6e6c7fd89ebbccc9a238fe02169e0cbc0 (patch) | |
| tree | 4462ab7d86ac380da4b9c017e2d32f75612e681b | |
| parent | 7d311bc5511f908fa82d9bb74c34e3d9c4df8d55 (diff) | |
| download | Qt-3985dfb6e6c7fd89ebbccc9a238fe02169e0cbc0.zip Qt-3985dfb6e6c7fd89ebbccc9a238fe02169e0cbc0.tar.gz Qt-3985dfb6e6c7fd89ebbccc9a238fe02169e0cbc0.tar.bz2 | |
fix glyph's CMAP index might be corrupted
when SMP sybmol is present in the font.
this is a simple typo fix, actually
Change-Id: I34fc01171f2893d36d36cc929b4f1a789a5f36db
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
(cherry picked from qtbase/51998eb4f65b92640176973ba0e0ed14adee561d)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
| -rw-r--r-- | src/gui/text/qfontengine_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_win.cpp b/src/gui/text/qfontengine_win.cpp index 66a741c..f2881ca 100644 --- a/src/gui/text/qfontengine_win.cpp +++ b/src/gui/text/qfontengine_win.cpp @@ -279,7 +279,7 @@ int QFontEngineWin::getGlyphIndexes(const QChar *str, int numChars, QGlyphLayout if (symbol) { for (; i < numChars; ++i, ++glyph_pos) { unsigned int uc = getChar(str, i, numChars); - glyphs->glyphs[i] = getTrueTypeGlyphIndex(cmap, uc); + glyphs->glyphs[glyph_pos] = getTrueTypeGlyphIndex(cmap, uc); if(!glyphs->glyphs[glyph_pos] && uc < 0x100) glyphs->glyphs[glyph_pos] = getTrueTypeGlyphIndex(cmap, uc + 0xf000); } |