diff options
| author | Patrick Lam <plam@MIT.EDU> | 2005-11-02 07:37:00 +0000 |
|---|---|---|
| committer | Patrick Lam <plam@MIT.EDU> | 2005-11-02 07:37:00 +0000 |
| commit | 303bcf9b9df00ce2906db5c9414aeec96d1a55f9 (patch) | |
| tree | 2b9f977d9df5f2b8df166966c56d3bcff16ca84d | |
| parent | c6b75577f3bf3019399e0a439d9cccf55e53999f (diff) | |
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!
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | fc-cache/fc-cache.c | 9 | ||||
| -rw-r--r-- | src/fcpat.c | 1 |
3 files changed, 9 insertions, 9 deletions
@@ -1,5 +1,13 @@ 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> + * fc-cache/fc-cache.c (scanDirs): Forcibly rescan a directory before writing a fresh local cache file for that directory, fixing the losing-fonts diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c index 3a4b7863..388baa76 100644 --- a/fc-cache/fc-cache.c +++ b/fc-cache/fc-cache.c @@ -207,15 +207,6 @@ scanDirs (FcStrList *list, FcConfig *config, char *program, FcBool force, FcBool if (!FcDirCacheUnlink (dir)) 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)) { fprintf (stderr, "Can't save cache in \"%s\"\n", dir); diff --git a/src/fcpat.c b/src/fcpat.c index b7f52793..fa63ea31 100644 --- a/src/fcpat.c +++ b/src/fcpat.c @@ -1718,6 +1718,7 @@ FcValueListSerialize(int bank, FcValueList *pi) fcvaluelists[bi][fcvaluelist_ptr] = *pi; new.bank = bank; new.u.stat = fcvaluelist_ptr++; + fcvaluelists[bi][new.u.stat].value = FcValueCanonicalize (&pi->value); v = &fcvaluelists[bi][new.u.stat].value; switch (v->type) { |