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!

diff --git a/ChangeLog b/ChangeLog
index 7f1845f57feee398eb64f12ac68434f95684db14..58148927d40c61dcedee2109da773bb6c16e4126 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
        * fc-cache/fc-cache.c (scanDirs):
 

diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index 3a4b78638f9691abafedd10552208ff13f0d9453..388baa7651d3386cabf8887eeed3a2168e787952 100644 (file)
--- 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 b7f52793c6e63a0515038a53660e4a0776c037b8..fa63ea3189a1bb2a3da6c706948eb38d874d3d65 100644 (file)
--- 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)
     {