Convert fromcode to char[12] from char *.
This commit is contained in:
parent
c7beacf916
commit
bef069e19e
|
@ -113,7 +113,7 @@ FcFreeTypeIsExclusiveLang (const FcChar8 *lang)
|
||||||
typedef struct {
|
typedef struct {
|
||||||
FT_UShort platform_id;
|
FT_UShort platform_id;
|
||||||
FT_UShort encoding_id;
|
FT_UShort encoding_id;
|
||||||
char *fromcode;
|
const char fromcode[12];
|
||||||
} FcFtEncoding;
|
} FcFtEncoding;
|
||||||
|
|
||||||
#define TT_ENCODING_DONT_CARE 0xffff
|
#define TT_ENCODING_DONT_CARE 0xffff
|
||||||
|
@ -549,7 +549,7 @@ static const FcFtLanguage fcFtLanguage[] = {
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
FT_UShort language_id;
|
FT_UShort language_id;
|
||||||
char *fromcode;
|
char fromcode[12];
|
||||||
} FcMacRomanFake;
|
} FcMacRomanFake;
|
||||||
|
|
||||||
static const FcMacRomanFake fcMacRomanFake[] = {
|
static const FcMacRomanFake fcMacRomanFake[] = {
|
||||||
|
@ -571,7 +571,7 @@ static FcChar8 *
|
||||||
FcSfntNameTranscode (FT_SfntName *sname)
|
FcSfntNameTranscode (FT_SfntName *sname)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
char *fromcode;
|
const char *fromcode;
|
||||||
#if USE_ICONV
|
#if USE_ICONV
|
||||||
iconv_t cd;
|
iconv_t cd;
|
||||||
#endif
|
#endif
|
||||||
|
@ -596,7 +596,7 @@ FcSfntNameTranscode (FT_SfntName *sname)
|
||||||
{
|
{
|
||||||
int f;
|
int f;
|
||||||
|
|
||||||
fromcode = 0;
|
fromcode = NULL;
|
||||||
for (f = 0; f < NUM_FC_MAC_ROMAN_FAKE; f++)
|
for (f = 0; f < NUM_FC_MAC_ROMAN_FAKE; f++)
|
||||||
if (fcMacRomanFake[f].language_id == sname->language_id)
|
if (fcMacRomanFake[f].language_id == sname->language_id)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue