Update HarfBuzz, ICU and FreeType
HarfBuzz: Update to version 7.3.0 ICU4C: Update to version 73.1 FreeType: Update to version 2.13.0
This commit is contained in:
parent
d5c1b9f883
commit
b64df2bf74
810 changed files with 32198 additions and 11081 deletions
36
thirdparty/icu4c/common/ucnv_ct.cpp
vendored
36
thirdparty/icu4c/common/ucnv_ct.cpp
vendored
|
|
@ -261,13 +261,13 @@ static COMPOUND_TEXT_CONVERTERS findStateFromEscSeq(const char* source, const ch
|
|||
static void U_CALLCONV
|
||||
_CompoundTextOpen(UConverter *cnv, UConverterLoadArgs *pArgs, UErrorCode *errorCode){
|
||||
cnv->extraInfo = uprv_malloc (sizeof (UConverterDataCompoundText));
|
||||
if (cnv->extraInfo != NULL) {
|
||||
if (cnv->extraInfo != nullptr) {
|
||||
UConverterDataCompoundText *myConverterData = (UConverterDataCompoundText *) cnv->extraInfo;
|
||||
|
||||
UConverterNamePieces stackPieces;
|
||||
UConverterLoadArgs stackArgs=UCNV_LOAD_ARGS_INITIALIZER;
|
||||
|
||||
myConverterData->myConverterArray[COMPOUND_TEXT_SINGLE_0] = NULL;
|
||||
myConverterData->myConverterArray[COMPOUND_TEXT_SINGLE_0] = nullptr;
|
||||
myConverterData->myConverterArray[COMPOUND_TEXT_SINGLE_1] = ucnv_loadSharedData("icu-internal-compound-s1", &stackPieces, &stackArgs, errorCode);
|
||||
myConverterData->myConverterArray[COMPOUND_TEXT_SINGLE_2] = ucnv_loadSharedData("icu-internal-compound-s2", &stackPieces, &stackArgs, errorCode);
|
||||
myConverterData->myConverterArray[COMPOUND_TEXT_SINGLE_3] = ucnv_loadSharedData("icu-internal-compound-s3", &stackPieces, &stackArgs, errorCode);
|
||||
|
|
@ -306,16 +306,16 @@ _CompoundTextClose(UConverter *converter) {
|
|||
UConverterDataCompoundText* myConverterData = (UConverterDataCompoundText*)(converter->extraInfo);
|
||||
int32_t i;
|
||||
|
||||
if (converter->extraInfo != NULL) {
|
||||
if (converter->extraInfo != nullptr) {
|
||||
/*close the array of converter pointers and free the memory*/
|
||||
for (i = 0; i < NUM_OF_CONVERTERS; i++) {
|
||||
if (myConverterData->myConverterArray[i] != NULL) {
|
||||
if (myConverterData->myConverterArray[i] != nullptr) {
|
||||
ucnv_unloadSharedDataIfReady(myConverterData->myConverterArray[i]);
|
||||
}
|
||||
}
|
||||
|
||||
uprv_free(converter->extraInfo);
|
||||
converter->extraInfo = NULL;
|
||||
converter->extraInfo = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -336,8 +336,8 @@ UConverter_fromUnicode_CompoundText_OFFSETS(UConverterFromUnicodeArgs* args, UEr
|
|||
UConverter *cnv = args->converter;
|
||||
uint8_t *target = (uint8_t *) args->target;
|
||||
const uint8_t *targetLimit = (const uint8_t *) args->targetLimit;
|
||||
const UChar* source = args->source;
|
||||
const UChar* sourceLimit = args->sourceLimit;
|
||||
const char16_t* source = args->source;
|
||||
const char16_t* sourceLimit = args->sourceLimit;
|
||||
/* int32_t* offsets = args->offsets; */
|
||||
UChar32 sourceChar;
|
||||
UBool useFallback = cnv->useFallback;
|
||||
|
|
@ -368,7 +368,7 @@ getTrail:
|
|||
/*look ahead to find the trail surrogate*/
|
||||
if(source < sourceLimit) {
|
||||
/* test the following code unit */
|
||||
UChar trail=(UChar) *source;
|
||||
char16_t trail=(char16_t) *source;
|
||||
if(U16_IS_TRAIL(trail)) {
|
||||
source++;
|
||||
sourceChar=U16_GET_SUPPLEMENTARY(sourceChar, trail);
|
||||
|
|
@ -467,14 +467,14 @@ static void U_CALLCONV
|
|||
UConverter_toUnicode_CompoundText_OFFSETS(UConverterToUnicodeArgs *args,
|
||||
UErrorCode* err){
|
||||
const char *mySource = (char *) args->source;
|
||||
UChar *myTarget = args->target;
|
||||
char16_t *myTarget = args->target;
|
||||
const char *mySourceLimit = args->sourceLimit;
|
||||
const char *tmpSourceLimit = mySourceLimit;
|
||||
uint32_t mySourceChar = 0x0000;
|
||||
COMPOUND_TEXT_CONVERTERS currentState, tmpState;
|
||||
int32_t sourceOffset = 0;
|
||||
UConverterDataCompoundText *myConverterData = (UConverterDataCompoundText *) args->converter->extraInfo;
|
||||
UConverterSharedData* savedSharedData = NULL;
|
||||
UConverterSharedData* savedSharedData = nullptr;
|
||||
|
||||
UConverterToUnicodeArgs subArgs;
|
||||
int32_t minArgsSize;
|
||||
|
|
@ -602,8 +602,8 @@ static const UConverterImpl _CompoundTextImpl = {
|
|||
|
||||
UCNV_COMPOUND_TEXT,
|
||||
|
||||
NULL,
|
||||
NULL,
|
||||
nullptr,
|
||||
nullptr,
|
||||
|
||||
_CompoundTextOpen,
|
||||
_CompoundTextClose,
|
||||
|
|
@ -613,15 +613,15 @@ static const UConverterImpl _CompoundTextImpl = {
|
|||
UConverter_toUnicode_CompoundText_OFFSETS,
|
||||
UConverter_fromUnicode_CompoundText_OFFSETS,
|
||||
UConverter_fromUnicode_CompoundText_OFFSETS,
|
||||
NULL,
|
||||
nullptr,
|
||||
|
||||
NULL,
|
||||
nullptr,
|
||||
_CompoundTextgetName,
|
||||
NULL,
|
||||
NULL,
|
||||
nullptr,
|
||||
nullptr,
|
||||
_CompoundText_GetUnicodeSet,
|
||||
NULL,
|
||||
NULL
|
||||
nullptr,
|
||||
nullptr
|
||||
};
|
||||
|
||||
static const UConverterStaticData _CompoundTextStaticData = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue