ICU-96 fixed a mental typo (uint16_t is not UChar)
X-SVN-Rev: 4919
This commit is contained in:
parent
62f2fc9fd7
commit
bc82668594
@ -938,7 +938,7 @@ UCATableHeader *ucol_assembleTailoringTable(UColTokenParser *src, UErrorCode *st
|
||||
/* copy contractions from the UCA - this is felt mostly for cyrillic*/
|
||||
|
||||
uint32_t tailoredCE = UCOL_NOT_FOUND;
|
||||
uint16_t *conts = (uint16_t *)((uint8_t *)src->UCA->image + src->UCA->image->contractionUCACombos);
|
||||
UChar *conts = (UChar *)((uint8_t *)src->UCA->image + src->UCA->image->contractionUCACombos);
|
||||
UCollationElements *ucaEl = ucol_openElements(src->UCA, NULL, 0, status);
|
||||
while(*conts != 0) {
|
||||
tailoredCE = ucmp32_get(t->mapping, *conts);
|
||||
|
@ -511,7 +511,7 @@ UCAElements *readAnElement(FILE *data, UErrorCode *status) {
|
||||
|
||||
|
||||
void writeOutData(UCATableHeader *data,
|
||||
uint16_t contractions[][3],
|
||||
UChar contractions[][3],
|
||||
uint32_t noOfcontractions,
|
||||
const char *outputDir,
|
||||
const char *copyright,
|
||||
@ -531,7 +531,7 @@ void writeOutData(UCATableHeader *data,
|
||||
|
||||
|
||||
data->contractionUCACombos = size;
|
||||
data->size += paddedsize((noOfcontractions*3*sizeof(uint16_t)));
|
||||
data->size += paddedsize((noOfcontractions*3*sizeof(UChar)));
|
||||
}
|
||||
|
||||
UNewDataMemory *pData;
|
||||
@ -553,8 +553,8 @@ void writeOutData(UCATableHeader *data,
|
||||
udata_writeBlock(pData, data, size);
|
||||
|
||||
if(noOfcontractions != 0) {
|
||||
udata_writeBlock(pData, contractions, noOfcontractions*3*sizeof(uint16_t));
|
||||
udata_writePadding(pData, paddedsize((noOfcontractions*3*sizeof(uint16_t))) - noOfcontractions*3*sizeof(uint16_t));
|
||||
udata_writeBlock(pData, contractions, noOfcontractions*3*sizeof(UChar));
|
||||
udata_writePadding(pData, paddedsize((noOfcontractions*3*sizeof(UChar))) - noOfcontractions*3*sizeof(uint16_t));
|
||||
}
|
||||
|
||||
/* finish up */
|
||||
@ -577,7 +577,7 @@ write_uca_table(const char *filename,
|
||||
UChar variableTopValue = 0;
|
||||
UCATableHeader *myD = (UCATableHeader *)uprv_malloc(sizeof(UCATableHeader));
|
||||
UColOptionSet *opts = (UColOptionSet *)uprv_malloc(sizeof(UColOptionSet));
|
||||
uint16_t contractionCEs[256][3];
|
||||
UChar contractionCEs[256][3];
|
||||
uint32_t noOfContractions = 0;
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user