summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiang Jiang <jiang.jiang@nokia.com>2012-01-18 14:58:41 +0100
committerJiang Jiang <jiang.jiang@nokia.com>2012-01-18 14:58:41 +0100
commite88dbaa7fcd8b00b22759e815747fb30725c73ed (patch)
tree67315b46119346cb5b407ca3bc87deff6f3e6995
parentd558a2c85f61ad2c634531b06cfc75581e2e2e2b (diff)
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
-rw-r--r--src/gui/text/qtextengine_mac.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/text/qtextengine_mac.cpp b/src/gui/text/qtextengine_mac.cpp
index 7566d444c5..ead2806b82 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);