FcCharSetSerialize was using wrong offset for leaves. Make fc-cat work.

[fontconfig.git] / src / fcint.h

diff --git a/src/fcint.h b/src/fcint.h
index 2f656cb2d84bb93565eaf9677d15a776011bdc93..adb3b16b5f47ef499c89ad628863c4e9e3e2df04 100644 (file)
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -199,11 +199,12 @@ struct _FcPattern {
 #define FcPatternElts(p)       FcOffsetMember(p,elts_offset,FcPatternElt)
 
 #define FcFontSetFonts(fs)     FcPointerMember(fs,fonts,FcPattern *)
-/*
+
 #define FcFontSetFont(fs,i)    (FcIsEncodedOffset((fs)->fonts) ? \
-                                FcOffsetToPtr(FcFontSetFonts(fs), \
-                                              FcFontSetFonts(fs)[i]) : \
-                                fs->fonts[i])*/
+                                FcEncodedOffsetToPtr(FcFontSetFonts(fs), \
+                                                     FcFontSetFonts(fs)[i], \
+                                                     FcPattern) : \
+                                fs->fonts[i])
                                                
 typedef enum _FcOp {
     FcOpInteger, FcOpDouble, FcOpString, FcOpMatrix, FcOpBool, FcOpCharSet, 
@@ -490,6 +491,12 @@ FcBool
 FcDirCacheConsume (FILE *file, FcFontSet *set, FcStrSet *dirs,
                   const FcChar8 *dir, char *dirname);
     
+FcCache *
+FcDirCacheMap (int fd, off_t size);
+
+void
+FcDirCacheUnmap (FcCache *cache);
+
 FcBool
 FcDirCacheRead (FcFontSet * set, FcStrSet * dirs, const FcChar8 *dir, FcConfig *config);