diff options
Diffstat (limited to 'fontconfig/src/fcdir.c')
| -rw-r--r-- | fontconfig/src/fcdir.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fontconfig/src/fcdir.c b/fontconfig/src/fcdir.c index 359446c36..8a2b97625 100644 --- a/fontconfig/src/fcdir.c +++ b/fontconfig/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); |