Don't kill fonts because they don't declare an element that's being matched

on.
reviewed by: plam
This commit is contained in:
Patrick Lam 2006-02-10 19:40:11 +00:00
parent 879af7060b
commit f11a184104
2 changed files with 11 additions and 0 deletions

View File

@ -1,3 +1,10 @@
2006-02-10 Takashi Iwai <tiwai@suse.de>
reviewed by: plam
* src/fcmatch.c (FcFontSetMatch):
Don't kill fonts because they don't declare an element that's
being matched on.
2006-02-09 Patrick Lam <plam@mit.edu>
* src/fccache.c (FcGlobalCacheLoad, FcGlobalCacheSave,
FcDirCacheUnlink, FcDirCacheOpen, FcDirCacheWrite):

View File

@ -673,6 +673,10 @@ FcFontSetMatch (FcConfig *config,
}
}
/* We had no matching, just try the next one */
if (score == 1e99)
continue;
/* If there's a previous champion, and current score
* beats previous best score, on this element, then
* knock out the previous champion and anything