AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

initCharAttributes() micro-optimization

Browse Source 
Change-Id: Id8e275c9b4ae0a9855b8ba8917824c79cde5a919
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Konstantin Ritt 2013-08-13 04:48:05 +03:00 committed by The Qt Project
parent a15b56b0c1
commit f3ffebe5f8
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/corelib/tools/qunicodetools.cpp
View File

@ -603,28 +603,35 @@ Q_CORE_EXPORT void initCharAttributes(const ushort *string, int length,
if (options & WhiteSpaces) if (options & WhiteSpaces)
getWhiteSpaces(string, length, attributes); getWhiteSpaces(string, length, attributes);
if (!items || numItems <= 0)
return;
if (!qt_initcharattributes_default_algorithm_only) { if (!qt_initcharattributes_default_algorithm_only) {
if (!items || numItems <= 0)
return;
QVarLengthArray<HB_ScriptItem, 64> scriptItems; QVarLengthArray<HB_ScriptItem, 64> scriptItems;
scriptItems.reserve(numItems); scriptItems.reserve(numItems);
int start = 0; int start = 0;
HB_Script startScript = script_to_hbscript(items[start].script);
if (Q_UNLIKELY(startScript == HB_Script_Inherited))
startScript = HB_Script_Common;
for (int i = start + 1; i < numItems; ++i) { for (int i = start + 1; i < numItems; ++i) {
if (script_to_hbscript(items[i].script) == script_to_hbscript(items[start].script)) HB_Script script = script_to_hbscript(items[i].script);
if (Q_LIKELY(script == startScript || script == HB_Script_Inherited))
continue; continue;
Q_ASSERT(items[i].position > items[start].position);
HB_ScriptItem item; HB_ScriptItem item;
item.pos = items[start].position; item.pos = items[start].position;
item.length = items[i].position - items[start].position; item.length = items[i].position - items[start].position;
item.script = script_to_hbscript(items[start].script); item.script = startScript;
item.bidiLevel = 0; // unused item.bidiLevel = 0; // unused
scriptItems.append(item); scriptItems.append(item);
start = i; start = i;
startScript = script;
} }
if (items[start].position + 1 < length) { if (items[start].position + 1 < length) {
HB_ScriptItem item; HB_ScriptItem item;
item.pos = items[start].position; item.pos = items[start].position;
item.length = length - items[start].position; item.length = length - items[start].position;
item.script = script_to_hbscript(items[start].script); item.script = startScript;
item.bidiLevel = 0; // unused item.bidiLevel = 0; // unused
scriptItems.append(item); scriptItems.append(item);
} }