Commit f4103bf7 authored by Akira TAGOH's avatar Akira TAGOH

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

parent 07e52eeb
......@@ -1419,6 +1419,22 @@ FcConfigSubstituteWithPat (FcConfig *config,
switch (kind) {
case FcMatchPattern:
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;
case FcMatchFont:
s = config->substFont;
......@@ -1435,23 +1451,6 @@ FcConfigSubstituteWithPat (FcConfig *config,
return FcFalse;
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)
{
printf ("FcConfigSubstitute ");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment