diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-03-28 08:59:27 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-03-28 08:59:27 (GMT) |
| commit | e41433295fbde082572c663889f65dd1c2180183 (patch) | |
| tree | 16a5960a064745afea3c683976150173c1d6cb06 /src/gui/text/qtextengine.cpp | |
| parent | 3b05c91ab8876ab64855900bb5a8cf38f91b69f3 (diff) | |
| parent | f5542efa32c0e28f28b361c554f9ae2c3f6fc546 (diff) | |
| download | Qt-e41433295fbde082572c663889f65dd1c2180183.zip Qt-e41433295fbde082572c663889f65dd1c2180183.tar.gz Qt-e41433295fbde082572c663889f65dd1c2180183.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Diffstat (limited to 'src/gui/text/qtextengine.cpp')
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index b511b5a..4378c62 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -1233,6 +1233,8 @@ void QTextEngine::shapeTextWithHarfbuzz(int item) const shaper_item.num_glyphs -= itemBoundaries[k + 1]; } shaper_item.initialGlyphCount = shaper_item.num_glyphs; + if (shaper_item.num_glyphs < shaper_item.item.length) + shaper_item.num_glyphs = shaper_item.item.length; QFontEngine *actualFontEngine = font; uint engineIdx = 0; @@ -1257,7 +1259,8 @@ void QTextEngine::shapeTextWithHarfbuzz(int item) const } const QGlyphLayout g = availableGlyphs(&si).mid(glyph_pos); - moveGlyphData(g.mid(shaper_item.num_glyphs), g.mid(shaper_item.initialGlyphCount), remaining_glyphs); + if (shaper_item.num_glyphs > shaper_item.item.length) + moveGlyphData(g.mid(shaper_item.num_glyphs), g.mid(shaper_item.initialGlyphCount), remaining_glyphs); shaper_item.glyphs = g.glyphs; shaper_item.attributes = g.attributes; |