From f11a184104a57c0d68afde8e7458c7b8473b6671 Mon Sep 17 00:00:00 2001 From: Patrick Lam Date: Fri, 10 Feb 2006 19:40:11 +0000 Subject: [PATCH] Don't kill fonts because they don't declare an element that's being matched on. reviewed by: plam --- ChangeLog | 7 +++++++ src/fcmatch.c | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index d5224a7..23e74e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-02-10 Takashi Iwai + 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 * src/fccache.c (FcGlobalCacheLoad, FcGlobalCacheSave, FcDirCacheUnlink, FcDirCacheOpen, FcDirCacheWrite): diff --git a/src/fcmatch.c b/src/fcmatch.c index cf702c6..30336ff 100644 --- a/src/fcmatch.c +++ b/src/fcmatch.c @@ -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