Add FcMatchScan to resolve Delicious font matching issues (bug #6769)

[fontconfig.git] / src / fcint.h

diff --git a/src/fcint.h b/src/fcint.h
index 42aa0eb20e6251bf01883de459978e12644359cb..3b9f3c852697c7259a00ce006a21cf8278a67028 100644 (file)
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -201,7 +201,7 @@ struct _FcPattern {
 #define FcFontSetFonts(fs)     FcPointerMember(fs,fonts,FcPattern *)
 
 #define FcFontSetFont(fs,i)    (FcIsEncodedOffset((fs)->fonts) ? \
-                                FcEncodedOffsetToPtr(FcFontSetFonts(fs), \
+                                FcEncodedOffsetToPtr(fs, \
                                                      FcFontSetFonts(fs)[i], \
                                                      FcPattern) : \
                                 fs->fonts[i])
@@ -452,6 +452,7 @@ struct _FcConfig {
      */
     FcSubst    *substPattern;      /* substitutions for patterns */
     FcSubst    *substFont;         /* substitutions for fonts */
+    FcSubst    *substScan;         /* substitutions for scanned fonts */
     int                maxObjects;         /* maximum number of tests in all substs */
     /*
      * List of patterns used to control font file selection
@@ -875,6 +876,7 @@ FcListPatternMatchAny (const FcPattern *p,
 #define FC_FONTFORMAT_OBJECT   37
 #define FC_EMBOLDEN_OBJECT     38
 #define FC_EMBEDDED_BITMAP_OBJECT      39
+#define FC_DECORATIVE_OBJECT   40
 
 FcBool
 FcNameBool (const FcChar8 *v, FcBool *result);