From 8a49ff701cfa50f9dcb237051e2ba7ac0302a515 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 21 Jun 2011 14:40:39 +0200 Subject: fontconfig mesa git update 21 June 2011 --- fontconfig/src/fcdir.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'fontconfig/src/fcdir.c') 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); -- cgit v1.2.3