Bug 36577 - Updating cache with no-bitmaps disables bitmap fonts...

Do not remove blacklisted fonts during cache generation.  We already
apply the blacklist when reading the caches.  The idea always has been
that the config should not affect caches built, although that design
was tarnished with the introduction of target="scan" configurations.

diff --git a/src/fcdir.c b/src/fcdir.c
index 359446c..8a2b976 100644 (file)
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -65,7 +65,7 @@ FcFileScanFontConfig (FcFontSet               *set,
        /*
         * Edit pattern with user-defined rules
         */
-       if (font && config && !FcConfigSubstituteWithPat (config, font, NULL, FcMatchScan))
+       if (font && config && !FcConfigSubstitute (config, font, FcMatchScan))
        {
            FcPatternDestroy (font);
            font = NULL;
@@ -75,7 +75,7 @@ FcFileScanFontConfig (FcFontSet               *set,
        /*
         * Add the font
         */
-       if (font && (!config || FcConfigAcceptFont (config, font)))
+       if (font)
        {
            if (FcDebug() & FC_DBG_SCANV)
            {
@@ -304,9 +304,6 @@ FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config)
 {
     FcCache            *cache = NULL;
 
-    if (config && !FcConfigAcceptFilename (config, dir))
-       return NULL;
-
     /* Try to use existing cache file */
     if (!force)
        cache = FcDirCacheLoad (dir, config, NULL);