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

Revert the previous patch and commit the correct patch: I forgot a 

canonicalization in FcValueListSerialize, so that it would choke on
    already-serialized input files. Duh!
This commit is contained in:
Patrick Lam 2005-11-02 07:37:00 +00:00
parent c6b75577f3
commit 303bcf9b9d
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2005-11-02 Patrick Lam <plam@mit.edu>
* fc-cache/fc-cache.c (scanDirs):
* src/fcpat.c (FcValueListSerialize):
Revert the previous patch and commit the correct patch:
I forgot a canonicalization in FcValueListSerialize, so
that it would choke on already-serialized input files. Duh!
2005-11-02 Patrick Lam <plam@mit.edu> 2005-11-02 Patrick Lam <plam@mit.edu>
* fc-cache/fc-cache.c (scanDirs): * fc-cache/fc-cache.c (scanDirs):

9
fc-cache/fc-cache.c
View File

@ -207,15 +207,6 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool
if (!FcDirCacheUnlink (dir)) if (!FcDirCacheUnlink (dir))
ret++; ret++;
if (!FcDirScan (set, subdirs, 0, FcConfigGetBlanks (config), dir, FcTrue))
{
fprintf (stderr, "\"%s\": error scanning\n", dir);
FcFontSetDestroy (set);
FcStrSetDestroy (subdirs);
ret++;
continue;
}
if (!FcDirSave (set, subdirs, dir)) if (!FcDirSave (set, subdirs, dir))
{ {
fprintf (stderr, "Can't save cache in \"%s\"\n", dir); fprintf (stderr, "Can't save cache in \"%s\"\n", dir);

1
src/fcpat.c
View File

@ -1718,6 +1718,7 @@ FcValueListSerialize(int bank, FcValueList *pi)
fcvaluelists[bi][fcvaluelist_ptr] = *pi; fcvaluelists[bi][fcvaluelist_ptr] = *pi;
new.bank = bank; new.bank = bank;
new.u.stat = fcvaluelist_ptr++; new.u.stat = fcvaluelist_ptr++;
fcvaluelists[bi][new.u.stat].value = FcValueCanonicalize (&pi->value);
v = &fcvaluelists[bi][new.u.stat].value; v = &fcvaluelists[bi][new.u.stat].value;
switch (v->type) switch (v->type)
{ {