X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=src%2Ffcfs.c;h=6625687c19c9be40eae678648930bd7f7776b919;hb=HEAD;hp=c2020402e663093d1b8fbb8764e05e445c8f907a;hpb=cd2ec1a940888ebcbd323a8000d2fcced41ddf9e;p=fontconfig.git

diff --git a/src/fcfs.c b/src/fcfs.c
index c202040..6625687 100644
--- a/src/fcfs.c
+++ b/src/fcfs.c
@@ -1,5 +1,5 @@
 /*
- * $RCSId: $
+ * fontconfig/src/fcfs.c
  *
  * Copyright © 2000 Keith Packard
  *
@@ -7,23 +7,23 @@
  * documentation for any purpose is hereby granted without fee, provided that
  * the above copyright notice appear in all copies and that both that
  * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
+ * documentation, and that the name of the author(s) not be used in
  * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
+ * specific, written prior permission.  The authors make no
  * representations about the suitability of this software for any purpose.  It
  * is provided "as is" without express or implied warranty.
  *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
  * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
  * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
  * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
 #include "fcint.h"
+#include <stdlib.h>
 
 FcFontSet *
 FcFontSetCreate (void)
@@ -61,7 +61,7 @@ FcFontSetAdd (FcFontSet *s, FcPattern *font)
 {
     FcPattern	**f;
     int		sfont;
-    
+
     if (s->nfont == s->sfont)
     {
 	sfont = s->sfont + 32;
@@ -82,37 +82,54 @@ FcFontSetAdd (FcFontSet *s, FcPattern *font)
 }
 
 FcBool
-FcFontSetPrepareSerialize (FcFontSet *s)
+FcFontSetSerializeAlloc (FcSerialize *serialize, const FcFontSet *s)
 {
     int i;
 
+    if (!FcSerializeAlloc (serialize, s, sizeof (FcFontSet)))
+	return FcFalse;
+    if (!FcSerializeAlloc (serialize, s->fonts, s->nfont * sizeof (FcPattern *)))
+	return FcFalse;
     for (i = 0; i < s->nfont; i++)
-	if (!FcPatternPrepareSerialize(s->fonts[i]))
+    {
+	if (!FcPatternSerializeAlloc (serialize, s->fonts[i]))
 	    return FcFalse;
-
+    }
     return FcTrue;
 }
 
-FcBool
-FcFontSetSerialize (FcFontSet * s)
+FcFontSet *
+FcFontSetSerialize (FcSerialize *serialize, const FcFontSet * s)
 {
-    int i;
-    FcPattern * p;
+    int		i;
+    FcFontSet	*s_serialize;
+    FcPattern	**fonts_serialize;
+    FcPattern	*p_serialize;
+
+    s_serialize = FcSerializePtr (serialize, s);
+    if (!s_serialize)
+	return NULL;
+    *s_serialize = *s;
+    s_serialize->sfont = s_serialize->nfont;
+
+    fonts_serialize = FcSerializePtr (serialize, s->fonts);
+    if (!fonts_serialize)
+	return NULL;
+    s_serialize->fonts = FcPtrToEncodedOffset (s_serialize,
+					       fonts_serialize, FcPattern *);
 
     for (i = 0; i < s->nfont; i++)
     {
-	p = FcPatternSerialize (s->fonts[i]);
-	if (!p) return FcFalse;
-	FcPatternDestroy (s->fonts[i]);
-
-	s->fonts[i] = p;
+	p_serialize = FcPatternSerialize (serialize, s->fonts[i]);
+	if (!p_serialize)
+	    return NULL;
+	fonts_serialize[i] = FcPtrToEncodedOffset (s_serialize,
+						   p_serialize,
+						   FcPattern);
     }
 
-    return FcTrue;
-}
-
-void
-FcFontSetClearStatic (void)
-{
-    FcPatternClearStatic();
+    return s_serialize;
 }
+#define __fcfs__
+#include "fcaliastail.h"
+#undef __fcfs__