ICU-8942 straggler fixes, parallel with C++

X-SVN-Rev: 30995
This commit is contained in:
Markus Scherer 2011-12-01 00:55:29 +00:00
parent 3a86b119b0
commit c50c6a20d7

View File

@ -3815,7 +3815,7 @@ final class CollationParsedRuleBuilder {
int supp = Character.toCodePoint(c, (char)0xdc00);
int suppLimit = supp + 0x400;
while (supp < suppLimit) {
fcd |= m_nfcImpl_.getFCD16(supp++);
fcd |= m_nfcImpl_.getFCD16FromNormData(supp++);
}
}
} else {
@ -3826,7 +3826,7 @@ final class CollationParsedRuleBuilder {
(UTF16.isLeadSurrogate(c) && fcd != 0)) {
// c is a leading surrogate with some FCD data
unsafeCPSet(t.m_unsafeCP_, c);
if (buildCMTable && (fcd != 0)) {
if (buildCMTable) {
int cc = (fcd & 0xff);
int pos = (cc << 8) + index[cc];
cm[pos] = c;