Module Name: xsrc
Committed By: mrg
Date: Sun Nov 21 06:50:47 UTC 2010
Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcint.h ftglue.c
Removed Files:
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel: index.html
r1034.html r1056.html r108.html r1099.html r1127.html r1148.html
r1171.html r1192.html r1237.html r1260.html r1283.html r129.html
r1309.html r1336.html r1367.html r1389.html r1412.html r1434.html
r1460.html r1482.html r150.html r1505.html r1529.html r1552.html
r1577.html r1602.html r1627.html r1652.html r1677.html r1699.html
r171.html r1724.html r1749.html r1774.html r1801.html r1829.html
r1858.html r1883.html r1905.html r192.html r1927.html r1950.html
r1976.html r2002.html r2032.html r2057.html r2081.html r2110.html
r213.html r2131.html r2155.html r2178.html r2201.html r2227.html
r2256.html r2286.html r2316.html r234.html r2349.html r2370.html
r2391.html r2413.html r2434.html r2456.html r2478.html r2501.html
r2522.html r2544.html r2566.html r258.html r2588.html r2609.html
r2631.html r2655.html r2676.html r2698.html r2721.html r2744.html
r2767.html r2788.html r279.html r2817.html r2842.html r2873.html
r2911.html r2942.html r2969.html r2993.html r301.html r3021.html
r3045.html r3069.html r3094.html r3118.html r3142.html r3164.html
r3192.html r3213.html r323.html r3234.html r3257.html r3283.html
r3305.html r3327.html r3349.html r3371.html r3393.html r3414.html
r3435.html r344.html r3460.html r3496.html r3518.html r3553.html
r3581.html r3607.html r3629.html r3656.html r3683.html r369.html
r3708.html r3733.html r3755.html r3778.html r3805.html r3827.html
r3852.html r3873.html r3898.html r3923.html r3948.html r397.html
r3973.html r3999.html r4021.html r4043.html r4065.html r4090.html
r4119.html r4144.html r4176.html r418.html r4209.html r4245.html
r4267.html r4289.html r4311.html r4334.html r4356.html r4380.html
r4405.html r4430.html r4457.html r446.html r4484.html r4509.html
r4530.html r4552.html r475.html r570.html r600.html r707.html
r759.html r782.html r807.html r828.html r856.html r878.html
r902.html r923.html r944.html r967.html r999.html
xsrc/external/mit/fontconfig/dist/fc-lang: ava.orth az.orth bam.orth
ful.orth ibo.orth ku.orth mn.orth ven.orth
Log Message:
merge fontconfig 2.8.0
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/index.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1034.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1056.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r108.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1099.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1127.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1148.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1171.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1192.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1237.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1260.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1283.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r129.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1309.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1336.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1367.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1389.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1412.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1434.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1460.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1482.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r150.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1505.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1529.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1552.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1577.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1602.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1627.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1652.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1677.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1699.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r171.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1724.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1749.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1774.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1801.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1829.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1858.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1883.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1905.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r192.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1927.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1950.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r1976.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2002.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2032.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2057.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2081.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2110.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r213.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2131.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2155.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2178.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2201.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2227.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2256.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2286.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2316.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r234.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2349.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2370.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2391.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2413.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2434.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2456.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2478.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2501.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2522.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2544.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2566.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r258.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2588.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2609.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2631.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2655.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2676.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2698.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2721.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2744.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2767.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2788.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r279.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2817.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2842.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2873.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2911.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2942.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2969.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r2993.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r301.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3021.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3045.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3069.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3094.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3118.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3142.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3164.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3192.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3213.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r323.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3234.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3257.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3283.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3305.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3327.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3349.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3371.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3393.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3414.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3435.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r344.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3460.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3496.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3518.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3553.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3581.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3607.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3629.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3656.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3683.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r369.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3708.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3733.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3755.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3778.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3805.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3827.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3852.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3873.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3898.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3923.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3948.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r397.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3973.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r3999.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4021.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4043.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4065.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4090.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4119.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4144.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4176.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r418.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4209.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4245.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4267.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4289.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4311.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4334.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4356.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4380.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4405.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4430.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4457.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r446.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4484.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4509.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4530.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r4552.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r475.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r570.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r600.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r707.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r759.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r782.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r807.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r828.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r856.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r878.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r902.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r923.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r944.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r967.html \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/r999.html
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/fontconfig/dist/fc-lang/ava.orth \
xsrc/external/mit/fontconfig/dist/fc-lang/az.orth \
xsrc/external/mit/fontconfig/dist/fc-lang/bam.orth \
xsrc/external/mit/fontconfig/dist/fc-lang/ful.orth \
xsrc/external/mit/fontconfig/dist/fc-lang/ibo.orth \
xsrc/external/mit/fontconfig/dist/fc-lang/ku.orth \
xsrc/external/mit/fontconfig/dist/fc-lang/mn.orth \
xsrc/external/mit/fontconfig/dist/fc-lang/ven.orth
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/fontconfig/dist/src/fcint.h \
xsrc/external/mit/fontconfig/dist/src/ftglue.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/src/fcint.h
diff -u xsrc/external/mit/fontconfig/dist/src/fcint.h:1.2 xsrc/external/mit/fontconfig/dist/src/fcint.h:1.3
--- xsrc/external/mit/fontconfig/dist/src/fcint.h:1.2 Wed Jul 30 05:23:53 2008
+++ xsrc/external/mit/fontconfig/dist/src/fcint.h Sun Nov 21 06:50:47 2010
@@ -1,5 +1,5 @@
/*
- * $RCSId: xc/lib/fontconfig/src/fcint.h,v 1.27 2002/08/31 22:17:32 keithp Exp $
+ * fontconfig/src/fcint.h
*
* Copyright © 2000 Keith Packard
*
@@ -13,9 +13,9 @@
* 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
@@ -122,9 +122,9 @@
#define FC_MEM_NUM 30
-#define FC_BANK_DYNAMIC 0
-#define FC_BANK_FIRST 1
-#define FC_BANK_LANGS 0xfcfcfcfc
+#define FC_MIN(a,b) ((a) < (b) ? (a) : (b))
+#define FC_MAX(a,b) ((a) > (b) ? (a) : (b))
+#define FC_ABS(a) ((a) < 0 ? -(a) : (a))
/* slim_internal.h */
#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun)
@@ -262,6 +262,15 @@
} u;
} FcExpr;
+typedef struct _FcExprPage FcExprPage;
+
+struct _FcExprPage {
+ FcExprPage *next_page;
+ FcExpr *next;
+ FcExpr exprs[(1024 - 2/* two pointers */ - 2/* malloc overhead */) * sizeof (void *) / sizeof (FcExpr)];
+ FcExpr end[0];
+};
+
typedef enum _FcQual {
FcQualAny, FcQualAll, FcQualFirst, FcQualNotFirst
} FcQual;
@@ -328,6 +337,7 @@
FcBool failed;
int len;
int size;
+ FcChar8 buf_static[16 * sizeof (void *)];
} FcStrBuf;
struct _FcCache {
@@ -356,6 +366,14 @@
#define FC_SERIALIZE_HASH_SIZE 8191
+typedef union _FcAlign {
+ double d;
+ int i;
+ intptr_t ip;
+ FcBool b;
+ void *p;
+} FcAlign;
+
typedef struct _FcSerializeBucket {
struct _FcSerializeBucket *next;
const void *object;
@@ -414,18 +432,9 @@
#define FC_MAX_FILE_LEN 4096
-/* XXX remove these when we're ready */
-
-#define fc_value_string(v) FcValueString(v)
-#define fc_value_charset(v) FcValueCharSet(v)
-#define fc_value_langset(v) FcValueLangSet(v)
-#define fc_storage_type(v) ((v)->type)
-
-#define fc_alignof(type) offsetof (struct { char c; type member; }, member)
-
#define FC_CACHE_MAGIC_MMAP 0xFC02FC04
#define FC_CACHE_MAGIC_ALLOC 0xFC02FC05
-#define FC_CACHE_CONTENT_VERSION 2
+#define FC_CACHE_CONTENT_VERSION 3 /* also check FC_CACHE_VERSION */
struct _FcAtomic {
FcChar8 *file; /* original file name */
@@ -498,6 +507,10 @@
*/
time_t rescanTime; /* last time information was scanned */
int rescanInterval; /* interval between scans */
+
+ int ref; /* reference count */
+
+ FcExprPage *expr_pool; /* pool of FcExpr's */
};
extern FcPrivate FcConfig *_fcConfig;
@@ -509,9 +522,6 @@
typedef struct _FcCharMap FcCharMap;
-/* watch out; assumes that v is void * -PL */
-#define ALIGN(v,type) ((void *)(((uintptr_t)(v) + fc_alignof(type) - 1) & ~(fc_alignof(type) - 1)))
-
/* fcblanks.c */
/* fccache.c */
@@ -537,8 +547,18 @@
FcPrivate void
FcDirCacheReference (FcCache *cache, int nref);
+#ifdef _WIN32
+FcPrivate int
+FcStat (const char *file, struct stat *statb);
+#else
+#define FcStat stat
+#endif
+
/* fccfg.c */
+FcPrivate FcExpr *
+FcConfigAllocExpr (FcConfig *config);
+
FcPrivate FcBool
FcConfigAddConfigDir (FcConfig *config,
const FcChar8 *d);
@@ -651,6 +671,16 @@
FcPrivate FcCharSet *
FcNameParseCharSet (FcChar8 *string);
+FcPrivate FcBool
+FcNameUnparseValue (FcStrBuf *buf,
+ FcValue *v0,
+ FcChar8 *escape);
+
+FcPrivate FcBool
+FcNameUnparseValueList (FcStrBuf *buf,
+ FcValueListPtr v,
+ FcChar8 *escape);
+
FcPrivate FcCharLeaf *
FcCharSetFindLeafCreate (FcCharSet *fcs, FcChar32 ucs4);
@@ -719,7 +749,7 @@
/* fcfont.c */
FcPrivate int
FcFontDebug (void);
-
+
/* fcfs.c */
FcPrivate FcBool
@@ -727,53 +757,11 @@
FcPrivate FcFontSet *
FcFontSetSerialize (FcSerialize *serialize, const FcFontSet * s);
-
-/* fcgram.y */
-FcPrivate int
-FcConfigparse (void);
-
-FcPrivate int
-FcConfigwrap (void);
-
-FcPrivate void
-FcConfigerror (char *fmt, ...);
-
-FcPrivate char *
-FcConfigSaveField (const char *field);
+/* fcxml.c */
FcPrivate void
FcTestDestroy (FcTest *test);
-FcPrivate FcExpr *
-FcExprCreateInteger (int i);
-
-FcPrivate FcExpr *
-FcExprCreateDouble (double d);
-
-FcPrivate FcExpr *
-FcExprCreateString (const FcChar8 *s);
-
-FcPrivate FcExpr *
-FcExprCreateMatrix (const FcMatrix *m);
-
-FcPrivate FcExpr *
-FcExprCreateBool (FcBool b);
-
-FcPrivate FcExpr *
-FcExprCreateNil (void);
-
-FcPrivate FcExpr *
-FcExprCreateField (const char *field);
-
-FcPrivate FcExpr *
-FcExprCreateConst (const FcChar8 *constant);
-
-FcPrivate FcExpr *
-FcExprCreateOp (FcExpr *left, FcOp op, FcExpr *right);
-
-FcPrivate void
-FcExprDestroy (FcExpr *e);
-
FcPrivate void
FcEditDestroy (FcEdit *e);
@@ -878,6 +866,9 @@
FcPrivate const char *
FcObjectName (FcObject object);
+FcPrivate FcObjectSet *
+FcObjectGetSet (void);
+
FcPrivate FcBool
FcObjectInit (void);
@@ -1010,6 +1001,9 @@
FcPrivate FcChar8 *
FcStrBufDone (FcStrBuf *buf);
+FcPrivate FcChar8 *
+FcStrBufDoneStatic (FcStrBuf *buf);
+
FcPrivate FcBool
FcStrBufChar (FcStrBuf *buf, FcChar8 c);
Index: xsrc/external/mit/fontconfig/dist/src/ftglue.c
diff -u xsrc/external/mit/fontconfig/dist/src/ftglue.c:1.2 xsrc/external/mit/fontconfig/dist/src/ftglue.c:1.3
--- xsrc/external/mit/fontconfig/dist/src/ftglue.c:1.2 Fri Jun 12 18:47:01 2009
+++ xsrc/external/mit/fontconfig/dist/src/ftglue.c Sun Nov 21 06:50:47 2010
@@ -62,64 +62,7 @@
} while (0)
-FTGLUE_APIDEF( FT_Pointer )
-ftglue_alloc( FT_Memory memory,
- FT_ULong size,
- FT_Error *perror )
-{
- FT_Error error = 0;
- FT_Pointer block = NULL;
-
- if ( size > 0 )
- {
- block = memory->alloc( memory, size );
- if ( !block )
- error = FT_Err_Out_Of_Memory;
- else
- memset( (char*)block, 0, (size_t)size );
- }
-
- *perror = error;
- return block;
-}
-
-
-FTGLUE_APIDEF( FT_Pointer )
-ftglue_realloc( FT_Memory memory,
- FT_Pointer block,
- FT_ULong old_size,
- FT_ULong new_size,
- FT_Error *perror )
-{
- FT_Pointer block2 = NULL;
- FT_Error error = 0;
-
- if ( old_size == 0 || block == NULL )
- {
- block2 = ftglue_alloc( memory, new_size, &error );
- }
- else if ( new_size == 0 )
- {
- ftglue_free( memory, block );
- }
- else
- {
- block2 = memory->realloc( memory, old_size, new_size, block );
- if ( block2 == NULL )
- error = FT_Err_Out_Of_Memory;
- else if ( new_size > old_size )
- memset( (char*)block2 + old_size, 0, (size_t)(new_size - old_size) );
- }
-
- if ( !error )
- block = block2;
-
- *perror = error;
- return block;
-}
-
-
-FTGLUE_APIDEF( void )
+static void
ftglue_free( FT_Memory memory,
FT_Pointer block )
{
@@ -127,7 +70,6 @@
memory->free( memory, block );
}
-
FTGLUE_APIDEF( FT_Long )
ftglue_stream_pos( FT_Stream stream )
{
@@ -247,10 +189,17 @@
/* parse the directory table directly, without using
* FreeType's built-in data structures
*/
- FT_ULong offset = 0;
+ FT_ULong offset = 0, sig;
FT_UInt count, nn;
- if ( face->num_faces > 1 )
+ if ( FILE_Seek( 0 ) || ACCESS_Frame( 4 ) )
+ goto Exit;
+
+ sig = GET_Tag4();
+
+ FORGET_Frame();
+
+ if ( sig == FT_MAKE_TAG( 't', 't', 'c', 'f' ) )
{
/* deal with TrueType collections */
@@ -296,7 +245,7 @@
goto FoundIt;
}
}
- error = TT_Err_Table_Missing;
+ error = FT_Err_Table_Missing;
FoundIt:
FORGET_Frame();
