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

ICU-1754 fixed bugs in support for canonical closure

Browse Source 
X-SVN-Rev: 7941
This commit is contained in:
Vladimir Weinstein 2002-03-12 00:49:48 +00:00
parent 72e4fe082e
commit b600896b2d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
icu4c/source/common/unorm.cpp
View File

@ -250,7 +250,9 @@ loadNormData(UErrorCode &errorCode) {
combiningTable=extraData+indexes[_NORM_INDEX_UCHAR_COUNT];
formatVersion_2_1=formatVersion[0]>2 || (formatVersion[0]==2 && formatVersion[1]>=1);
if(formatVersion_2_1) {
canonStartSets=combiningTable+(indexes[_NORM_INDEX_FCD_TRIE_SIZE]+indexes[_NORM_INDEX_AUX_TRIE_SIZE])/2;
canonStartSets=combiningTable+
indexes[_NORM_INDEX_COMBINE_DATA_COUNT]+
(indexes[_NORM_INDEX_FCD_TRIE_SIZE]+indexes[_NORM_INDEX_AUX_TRIE_SIZE])/2;
}
haveNormData=1;
@ -574,7 +576,7 @@ unorm_getCanonStartSet(UChar32 c, USerializedSet *fillSet) {
return aux32!=0 &&
uset_getSerializedSet(fillSet,
canonStartSets+aux32,
indexes[indexes[_NORM_INDEX_CANON_SET_COUNT]]-aux32);
indexes[_NORM_INDEX_CANON_SET_COUNT]-aux32);
} else {
return FALSE;
}

2
icu4c/source/tools/gennorm/store.c
View File

@ -1412,7 +1412,7 @@ generateData(const char *dataDir) {
exit(errorCode);
}
auxTrieSize=utrie_serialize(&auxTrie, auxTrieBlock, sizeof(auxTrieBlock), getFoldedAuxValue, TRUE, &errorCode);
auxTrieSize=utrie_serialize(&auxTrie, auxTrieBlock, sizeof(auxTrieBlock), getFoldedAuxValue, FALSE, &errorCode);
if(U_FAILURE(errorCode)) {
fprintf(stderr, "error: utrie_serialize(auxiliary data) failed, %s\n", u_errorName(errorCode));
exit(errorCode);