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

Actually use the directories that I added to the global cache. Fixes 'make 

check'.
This commit is contained in:
Patrick Lam 2006-01-31 04:42:20 +00:00
parent 275cf6cd83
commit 3616cbe251
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-01-30 Patrick Lam <plam@mit.edu>
* src/fccache.c (FcGlobalCacheReadDir):
Actually use the directories that I added to the global cache.
Fixes 'make check'.
2006-01-30 Mike Fabian <mfabian@suse.de> 2006-01-30 Mike Fabian <mfabian@suse.de>
reviewed by: plam reviewed by: plam

7
src/fccache.c
View File

@ -315,6 +315,7 @@ FcGlobalCacheReadDir (FcFontSet *set, FcStrSet *dirs, FcGlobalCache * cache, con
{ {
FcGlobalCacheDir *d; FcGlobalCacheDir *d;
FcBool ret = FcFalse; FcBool ret = FcFalse;
int i;
if (cache->fd == -1) if (cache->fd == -1)
return FcFalse; return FcFalse;
@ -329,10 +330,16 @@ FcGlobalCacheReadDir (FcFontSet *set, FcStrSet *dirs, FcGlobalCache * cache, con
lseek (cache->fd, d->offset, SEEK_SET); lseek (cache->fd, d->offset, SEEK_SET);
if (!FcDirCacheConsume (cache->fd, d->name, set, config)) if (!FcDirCacheConsume (cache->fd, d->name, set, config))
return FcFalse; return FcFalse;
if (strcmp (d->name, dir) == 0) if (strcmp (d->name, dir) == 0)
{
for (i = 0; i < d->subdirs->num; i++)
FcStrSetAdd (dirs, (FcChar8 *)d->subdirs->strs[i]);
ret = FcTrue; ret = FcTrue;
} }
} }
}
return ret; return ret;
} }