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

ICU-1594 remove supplemental latin1 mapping from the data file, as there is one already included in the utrie, and

Browse Source 
jitterbug 1599: testing the results of malloc/realloc, preserving status in some operations

X-SVN-Rev: 7377
This commit is contained in:
Vladimir Weinstein 2001-12-28 20:58:58 +00:00
parent 99976f36e8
commit 2131d21888
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
icu4c/source/i18n/ucol_elm.cpp
View File

@ -207,7 +207,7 @@ uprv_uca_cloneTempTable(tempUCATable *t, UErrorCode *status) {
}
if(t->contractions != NULL) {
r->contractions = uprv_cnttab_clone(t->contractions);
r->contractions = uprv_cnttab_clone(t->contractions, status);
r->contractions->mapping = r->mapping;
}
@ -1128,7 +1128,7 @@ uprv_uca_assembleTable(tempUCATable *t, UErrorCode *status) {
paddedsize(expansions->position*sizeof(uint32_t))+
paddedsize(mappingSize)+
paddedsize(contractionsSize*(sizeof(UChar)+sizeof(uint32_t)))+
paddedsize(0x100*sizeof(uint32_t))
//paddedsize(0x100*sizeof(uint32_t)) /* Latin1 is now included in the trie */
/* maxexpansion array */
+ paddedsize(maxexpansion->position * sizeof(uint32_t)) +
/* maxexpansion size array */
@ -1196,15 +1196,17 @@ uprv_uca_assembleTable(tempUCATable *t, UErrorCode *status) {
utrie_serialize(mapping, dataStart+tableOffset, toAllocate-tableOffset, getFoldedValue, FALSE, status);
tableOffset += paddedsize(mappingSize);
int32_t i = 0;
#if 0
/* construct the fast tracker for latin one*/
myData->latinOneMapping = tableOffset;
uint32_t *store = (uint32_t*)(dataStart+tableOffset);
int32_t i = 0;
for(i = 0; i<=0xFF; i++) {
/**(store++) = ucmpe32_get(mapping,i);*/
*(store++) = utrie_get32(mapping, i, NULL);
tableOffset+=(uint32_t)(sizeof(uint32_t));
}
#endif
/* copy max expansion table */
myData->endExpansionCE = tableOffset;