From b683aaa27430ced087b4230e031f56c3100f8068 Mon Sep 17 00:00:00 2001 From: Jiang Jiang Date: Tue, 19 Jul 2011 14:55:30 +0200 Subject: Move separator skipping to proper place So that it won't crash some places that requires shaping results. Reviewed-by: TrustMe --- src/gui/text/qtextengine.cpp | 6 ------ src/gui/text/qtextengine_mac.cpp | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index dd93cae..d92c418 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -897,12 +897,6 @@ void QTextEngine::shapeText(int item) const if (si.num_glyphs) return; - // 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)) - return; - #if defined(Q_WS_MAC) #if !defined(QT_ENABLE_HARFBUZZ_FOR_MAC) if (enableHarfBuzz()) { diff --git a/src/gui/text/qtextengine_mac.cpp b/src/gui/text/qtextengine_mac.cpp index 251d9b5..9da8f03 100644 --- a/src/gui/text/qtextengine_mac.cpp +++ b/src/gui/text/qtextengine_mac.cpp @@ -605,6 +605,12 @@ void QTextEngine::shapeTextMac(int item) const unsigned short *log_clusters = logClusters(&si); bool stringToCMapFailed = false; + // 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)) + goto cleanUp; + if (!fe->stringToCMap(str, len, &g, &num_glyphs, flags, log_clusters, attributes(), &si)) { ensureSpace(num_glyphs); g = availableGlyphs(&si); @@ -645,6 +651,7 @@ void QTextEngine::shapeTextMac(int item) const } } +cleanUp: const ushort *uc = reinterpret_cast(str); if ((si.analysis.flags == QScriptAnalysis::SmallCaps || si.analysis.flags == QScriptAnalysis::Uppercase -- cgit v0.12