From: Patrick Lam <plam@MIT.EDU>
Date: Fri, 10 Feb 2006 19:40:11 +0000 (+0000)
Subject: Don't kill fonts because they don't declare an element that's being matched
X-Git-Tag: fc-2_3_94~24
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f11a184104a57c0d68afde8e7458c7b8473b6671;p=fontconfig.git

Don't kill fonts because they don't declare an element that's being matched
    on.
reviewed by: plam
---

diff --git a/ChangeLog b/ChangeLog
index d5224a7..23e74e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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):
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