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

Do not copy FC_*LANG_OBJECT even if it's not available on the pattern 

those objects are linked to the corresponding string objects.
this may causes inconsistency that those objects has more values than them.
This commit is contained in:
Akira TAGOH 2013-03-07 13:19:50 +09:00
parent e96d776088
commit aad4d6f6c6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/fcmatch.c
View File

@ -532,7 +532,10 @@ FcFontRenderPrepare (FcConfig *config,
{ {
pe = &FcPatternElts(pat)[i]; pe = &FcPatternElts(pat)[i];
fe = FcPatternObjectFindElt (font, pe->object); fe = FcPatternObjectFindElt (font, pe->object);
if (!fe) if (!fe &&
pe->object != FC_FAMILYLANG_OBJECT &&
pe->object != FC_STYLELANG_OBJECT &&
pe->object != FC_FULLNAMELANG_OBJECT)
{ {
FcPatternObjectListAdd (new, pe->object, FcPatternObjectListAdd (new, pe->object,
FcValueListDuplicate (FcPatternEltValues(pe)), FcValueListDuplicate (FcPatternEltValues(pe)),