Switch to locale-independent string compare function
This commit is contained in:
parent
d6ea834746
commit
9f2bcb3e41
|
@ -574,33 +574,33 @@ FcFreeTypeQuery (const FcChar8 *file,
|
||||||
|
|
||||||
if (FT_Get_PS_Font_Info(face, &psfontinfo) == 0)
|
if (FT_Get_PS_Font_Info(face, &psfontinfo) == 0)
|
||||||
{
|
{
|
||||||
if (strcasecmp("thin", psfontinfo.weight) == 0)
|
if (FcStrCmpIgnoreCase((FcChar8 *)"thin", (FcChar8 *) psfontinfo.weight) == 0)
|
||||||
weight = FC_WEIGHT_THIN;
|
weight = FC_WEIGHT_THIN;
|
||||||
else if (strcasecmp("extralight", psfontinfo.weight) == 0)
|
else if (FcStrCmpIgnoreCase((FcChar8 *)"extralight", (FcChar8 *) psfontinfo.weight) == 0)
|
||||||
weight = FC_WEIGHT_EXTRALIGHT;
|
weight = FC_WEIGHT_EXTRALIGHT;
|
||||||
else if (strcasecmp("ultralight", psfontinfo.weight) == 0)
|
else if (FcStrCmpIgnoreCase((FcChar8 *)"ultralight", (FcChar8 *) psfontinfo.weight) == 0)
|
||||||
weight = FC_WEIGHT_ULTRALIGHT;
|
weight = FC_WEIGHT_ULTRALIGHT;
|
||||||
else if (strcasecmp("light", psfontinfo.weight) == 0)
|
else if (FcStrCmpIgnoreCase((FcChar8 *)"light", (FcChar8 *) psfontinfo.weight) == 0)
|
||||||
weight = FC_WEIGHT_LIGHT;
|
weight = FC_WEIGHT_LIGHT;
|
||||||
else if (strcasecmp("regular", psfontinfo.weight) == 0)
|
else if (FcStrCmpIgnoreCase((FcChar8 *)"regular", (FcChar8 *) psfontinfo.weight) == 0)
|
||||||
weight = FC_WEIGHT_REGULAR;
|
weight = FC_WEIGHT_REGULAR;
|
||||||
else if (strcasecmp("normal", psfontinfo.weight) == 0)
|
else if (FcStrCmpIgnoreCase((FcChar8 *)"normal", (FcChar8 *) psfontinfo.weight) == 0)
|
||||||
weight = FC_WEIGHT_NORMAL;
|
weight = FC_WEIGHT_NORMAL;
|
||||||
else if (strcasecmp("medium", psfontinfo.weight) == 0)
|
else if (FcStrCmpIgnoreCase((FcChar8 *)"medium", (FcChar8 *) psfontinfo.weight) == 0)
|
||||||
weight = FC_WEIGHT_MEDIUM;
|
weight = FC_WEIGHT_MEDIUM;
|
||||||
else if (strcasecmp("demibold", psfontinfo.weight) == 0)
|
else if (FcStrCmpIgnoreCase((FcChar8 *)"demibold", (FcChar8 *) psfontinfo.weight) == 0)
|
||||||
weight = FC_WEIGHT_DEMIBOLD;
|
weight = FC_WEIGHT_DEMIBOLD;
|
||||||
else if (strcasecmp("semibold", psfontinfo.weight) == 0)
|
else if (FcStrCmpIgnoreCase((FcChar8 *)"semibold", (FcChar8 *) psfontinfo.weight) == 0)
|
||||||
weight = FC_WEIGHT_SEMIBOLD;
|
weight = FC_WEIGHT_SEMIBOLD;
|
||||||
else if (strcasecmp("extrabold", psfontinfo.weight) == 0)
|
else if (FcStrCmpIgnoreCase((FcChar8 *)"extrabold", (FcChar8 *) psfontinfo.weight) == 0)
|
||||||
weight = FC_WEIGHT_EXTRABOLD;
|
weight = FC_WEIGHT_EXTRABOLD;
|
||||||
else if (strcasecmp("ultrabold", psfontinfo.weight) == 0)
|
else if (FcStrCmpIgnoreCase((FcChar8 *)"ultrabold", (FcChar8 *) psfontinfo.weight) == 0)
|
||||||
weight = FC_WEIGHT_EXTRABOLD;
|
weight = FC_WEIGHT_EXTRABOLD;
|
||||||
else if (strcasecmp("bold", psfontinfo.weight) == 0)
|
else if (FcStrCmpIgnoreCase((FcChar8 *)"bold", (FcChar8 *) psfontinfo.weight) == 0)
|
||||||
weight = FC_WEIGHT_BOLD;
|
weight = FC_WEIGHT_BOLD;
|
||||||
else if (strcasecmp("black", psfontinfo.weight) == 0)
|
else if (FcStrCmpIgnoreCase((FcChar8 *)"black", (FcChar8 *) psfontinfo.weight) == 0)
|
||||||
weight = FC_WEIGHT_BLACK;
|
weight = FC_WEIGHT_BLACK;
|
||||||
else if (strcasecmp("heavy", psfontinfo.weight) == 0)
|
else if (FcStrCmpIgnoreCase((FcChar8 *)"heavy", (FcChar8 *) psfontinfo.weight) == 0)
|
||||||
weight = FC_WEIGHT_BLACK;
|
weight = FC_WEIGHT_BLACK;
|
||||||
|
|
||||||
if (psfontinfo.italic_angle < 0)
|
if (psfontinfo.italic_angle < 0)
|
||||||
|
|
Loading…
Reference in New Issue