walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fcdefault: Add the lang object at FcConfigSubstituteWithPat() only when kind is FcMatchPattern

This commit is contained in:
Akira TAGOH 2012-06-08 19:17:57 +09:00
parent 07e52eeb09
commit f4103bf708
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/fccfg.c
View File

@ -1419,6 +1419,22 @@ FcConfigSubstituteWithPat (FcConfig *config,
switch (kind) { switch (kind) {
case FcMatchPattern: case FcMatchPattern:
s = config->substPattern; s = config->substPattern;
strs = FcGetDefaultLangs ();
if (strs)
{
FcStrList *l = FcStrListCreate (strs);
FcChar8 *lang;
FcValue v;
FcStrSetDestroy (strs);
while (l && (lang = FcStrListNext (l)))
{
v.type = FcTypeString;
v.u.s = lang;
FcPatternObjectAddWithBinding (p, FC_LANG_OBJECT, v, FcValueBindingWeak, FcTrue);
}
FcStrListDone (l);
}
break; break;
case FcMatchFont: case FcMatchFont:
s = config->substFont; s = config->substFont;
@ -1435,23 +1451,6 @@ FcConfigSubstituteWithPat (FcConfig *config,
return FcFalse; return FcFalse;
FcMemAlloc (FC_MEM_SUBSTATE, config->maxObjects * sizeof (FcSubState)); FcMemAlloc (FC_MEM_SUBSTATE, config->maxObjects * sizeof (FcSubState));
strs = FcGetDefaultLangs ();
if (strs)
{
FcStrList *l = FcStrListCreate (strs);
FcChar8 *lang;
FcValue v;
FcStrSetDestroy (strs);
while (l && (lang = FcStrListNext (l)))
{
v.type = FcTypeString;
v.u.s = lang;
FcPatternObjectAddWithBinding (p, FC_LANG_OBJECT, v, FcValueBindingWeak, FcTrue);
}
FcStrListDone (l);
}
if (FcDebug () & FC_DBG_EDIT) if (FcDebug () & FC_DBG_EDIT)
{ {
printf ("FcConfigSubstitute "); printf ("FcConfigSubstitute ");