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

Force FC_FOUNDRY and FC_WIDTH to always be set so that matches looking for 

explicit values prefer exact matches
This commit is contained in:
Keith Packard 2004-03-06 23:44:11 +00:00
parent 02638f1ace
commit 89e28590f3
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-03-06 Keith Packard <keithp@keithp.com>
* src/fcfreetype.c: (FcFreeTypeQuery):
Force FC_FOUNDRY and FC_WIDTH to always be set so that
matches looking for explicit values prefer exact matches
2004-03-02 Keith Packard <keithp@keithp.com>
Supplied by: mfabian@suse.de (Mike FABIAN)

18
src/fcfreetype.c
View File

@ -942,21 +942,23 @@ FcFreeTypeQuery (const FcChar8 *file,
weight = FC_WEIGHT_BOLD;
}
if (width == -1)
width = FC_WIDTH_NORMAL;
if (foundry == 0)
foundry = "unknown";
if (!FcPatternAddInteger (pat, FC_SLANT, slant))
goto bail1;
if (!FcPatternAddInteger (pat, FC_WEIGHT, weight))
goto bail1;
if (width != -1)
if (!FcPatternAddInteger (pat, FC_WIDTH, width))
goto bail1;
if (!FcPatternAddInteger (pat, FC_WIDTH, width))
goto bail1;
if(foundry)
{
if(!FcPatternAddString (pat, FC_FOUNDRY, foundry))
goto bail1;
}
if (!FcPatternAddString (pat, FC_FOUNDRY, foundry))
goto bail1;
/*
* Compute the unicode coverage for the font