diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-21 14:40:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-21 14:40:39 +0200 |
| commit | 8a49ff701cfa50f9dcb237051e2ba7ac0302a515 (patch) | |
| tree | 033ceda857988a1f0ca49e35eb848e37e281631f /fontconfig/src/fcdir.c | |
| parent | 4703c93aaecf0d5794eca723cd5b1b72b04d04ee (diff) | |
| download | vcxsrv-8a49ff701cfa50f9dcb237051e2ba7ac0302a515.tar.gz vcxsrv-8a49ff701cfa50f9dcb237051e2ba7ac0302a515.tar.bz2 vcxsrv-8a49ff701cfa50f9dcb237051e2ba7ac0302a515.zip | |
fontconfig mesa git update 21 June 2011
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); |