diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2012-01-18 13:58:41 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-18 17:07:00 (GMT) |
| commit | 81df02625ae7c5139fa409d1147a519629b7635c (patch) | |
| tree | 8ca5624005563b3ce2158ea3bfe609dfe492b588 | |
| parent | 44f415aafaf7eec56b31468a58e0ca768bbc082d (diff) | |
| download | Qt-81df02625ae7c5139fa409d1147a519629b7635c.zip Qt-81df02625ae7c5139fa409d1147a519629b7635c.tar.gz Qt-81df02625ae7c5139fa409d1147a519629b7635c.tar.bz2 | |
Cleaning logClusters for line separator layout shortcut
In some cases the logClusters are accessed, but we don't have actual
glyphs generated for them.
Task-number: QTBUG-23704
Change-Id: I719c183e17429941b32dd37bf8a4e5497edda6fe
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| -rw-r--r-- | src/gui/text/qtextengine_mac.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/text/qtextengine_mac.cpp b/src/gui/text/qtextengine_mac.cpp index 7566d44..ead2806 100644 --- a/src/gui/text/qtextengine_mac.cpp +++ b/src/gui/text/qtextengine_mac.cpp @@ -608,8 +608,10 @@ void QTextEngine::shapeTextMac(int item) const // Skip shaping of line or paragraph separators since we are not // going to draw them anyway if (si.analysis.flags == QScriptAnalysis::LineOrParagraphSeparator - && !(option.flags() & QTextOption::ShowLineAndParagraphSeparators)) + && !(option.flags() & QTextOption::ShowLineAndParagraphSeparators)) { + memset(log_clusters, 0, len * sizeof(unsigned short)); goto cleanUp; + } if (!fe->stringToCMap(str, len, &g, &num_glyphs, flags, log_clusters, attributes(), &si)) { ensureSpace(num_glyphs); |