walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow config->cache to be null (as it is when $HOME is not set) (2.2 

branch)
This commit is contained in:
Keith Packard 2003-06-26 00:39:56 +00:00
parent e65f957f4e
commit 339c83e11e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fccfg.c
View File

@ -160,7 +160,8 @@ FcConfigDestroy (FcConfig *config)
FcStrSetDestroy (config->fontDirs); FcStrSetDestroy (config->fontDirs);
FcStrSetDestroy (config->configFiles); FcStrSetDestroy (config->configFiles);
FcStrFree (config->cache); if (config->cache)
FcStrFree (config->cache);
FcSubstDestroy (config->substPattern); FcSubstDestroy (config->substPattern);
FcSubstDestroy (config->substFont); FcSubstDestroy (config->substFont);
@ -193,7 +194,8 @@ FcConfigBuildFonts (FcConfig *config)
if (!cache) if (!cache)
goto bail1; goto bail1;
FcGlobalCacheLoad (cache, config->cache); if (config->cache)
FcGlobalCacheLoad (cache, config->cache);
list = FcConfigGetFontDirs (config); list = FcConfigGetFontDirs (config);
if (!list) if (!list)
@ -211,7 +213,8 @@ FcConfigBuildFonts (FcConfig *config)
if (FcDebug () & FC_DBG_FONTSET) if (FcDebug () & FC_DBG_FONTSET)
FcFontSetPrint (fonts); FcFontSetPrint (fonts);
FcGlobalCacheSave (cache, config->cache); if (config->cache)
FcGlobalCacheSave (cache, config->cache);
FcGlobalCacheDestroy (cache); FcGlobalCacheDestroy (cache);
FcConfigSetFonts (config, fonts, FcSetSystem); FcConfigSetFonts (config, fonts, FcSetSystem);