Replace FcObjectStaticName by FcStrStaticName. Implement serialization of

[fontconfig.git] / src / fcfs.c

diff --git a/src/fcfs.c b/src/fcfs.c
index 1e5aa81fe16c2a40ad0ee97007e2c0dc3fdb2348..90e858082f13d1483b96f744e3fddfd906e5b8f3 100644 (file)
--- a/src/fcfs.c
+++ b/src/fcfs.c
@@ -87,7 +87,6 @@ void
 FcFontSetNewBank (void)
 {
     FcPatternNewBank();
-    FcObjectNewBank();
 }
 
 int
@@ -104,7 +103,7 @@ FcFontSetNeededBytes (FcFontSet *s)
     }
 
     if (cum > 0)
-       return cum + sizeof(int);
+       return cum + sizeof(int) + FcObjectNeededBytes();
     else
        return 0;
 }
@@ -138,6 +137,7 @@ FcFontSetSerialize (int bank, FcFontSet * s)
 
        s->fonts[i] = p;
     }
+    FcObjectSerialize();
 
     return FcTrue;
 }
@@ -166,10 +166,13 @@ FcFontSetUnserialize(FcCache metadata, FcFontSet * s, void * block_ptr)
 
     if (nfont > 0)
     {
-       FcPattern * p = FcPatternUnserialize (metadata, block_ptr);
+       FcPattern * p = (FcPattern *)block_ptr;
+       block_ptr = FcPatternUnserialize (metadata, block_ptr);
        for (i = 0; i < nfont; i++)
            s->fonts[n + i] = p+i;
+
+       block_ptr = FcObjectUnserialize (metadata, block_ptr);
     }
 
-    return FcTrue;
+    return block_ptr != 0;
 }