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

[fcmatch] Use larger multipliers to enforce order 

Previously the matcher multiplied comparison results by 100 and added
index value to it.  With long lists of families (lots of aliases),
reaching 100 is not that hard.  That could result in a non-match early
in the list to be preferred over a match late in the list.  Changing
the multiplier from 100 to 1000 should fix that.

To keep things relatively in order, the lang multiplier is changed
from 1000 to 10000.
This commit is contained in:
Behdad Esfahbod 2008-12-31 19:35:27 -05:00
parent 1b43ccc805
commit c7641f2872
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fcmatch.c
View File

@ -328,7 +328,7 @@ FcCompareValueList (FcObject object,
*result = FcResultTypeMismatch; *result = FcResultTypeMismatch;
return FcFalse; return FcFalse;
} }
v = v * 100 + j; v = v * 1000 + j;
if (v < best) if (v < best)
{ {
if (bestValue) if (bestValue)
@ -768,7 +768,7 @@ FcFontSetSort (FcConfig *config,
} }
} }
if (!satisfies) if (!satisfies)
nodeps[f]->score[MATCH_LANG_INDEX] = 1000.0; nodeps[f]->score[MATCH_LANG_INDEX] = 10000.0;
} }
/* /*