AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-89 improve performance for non-composing combining

Browse Source 
X-SVN-Rev: 1944
This commit is contained in:
Alan Liu 2000-07-19 16:09:09 +00:00
parent 00fc8e0218
commit 85d51e6ece
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
icu4c/source/common/normlzr.cpp
View File

@ -205,7 +205,11 @@ Normalizer::compose(const UnicodeString& source,
// We can only combine a character with the base if we haven't
// already seen a combining character with the same canonical class.
if (type == ComposeData::COMBINING && (classesSeen & cclass) == 0
// We also only combine characters with an index from
// 1..COMBINING_COUNT-1. Indices >= COMBINING_COUNT are
// non-combining; these formerly had an index of zero.
if (type == ComposeData::COMBINING && index < ComposeData::COMBINING_COUNT
&& (classesSeen & cclass) == 0
&& (action = composeAction(baseIndex, index)) > 0)
{
if (action > ComposeData::MAX_COMPOSED) {
@ -349,7 +353,8 @@ UChar Normalizer::nextCompose()
// We can only combine a character with the base if we haven't
// already seen a combining character with the same canonical class.
if (type == ComposeData::COMBINING && (classesSeen & cclass) == 0
if (type == ComposeData::COMBINING && index < ComposeData::COMBINING_COUNT
&& (classesSeen & cclass) == 0
&& (action = composeAction(baseIndex, index)) > 0)
{
if (action > ComposeData::MAX_COMPOSED) {