#include "fcint.h"
/* Please do not revoke any of these bindings. */
+/* The __DUMMY__ object enables callers to distinguish the error return
+ * of FcObjectToPtrLookup from FC_FAMILY's FcObjectPtr, which would
+ * otherwise be 0. */
static const FcObjectType _FcBaseObjectTypes[] = {
- { "__DUMMY__", FcTypeVoid, },
+ { "__DUMMY__", FcTypeVoid, },
{ FC_FAMILY, FcTypeString, },
{ FC_FAMILYLANG, FcTypeString, },
{ FC_STYLE, FcTypeString, },
{ FC_CAPABILITY, FcTypeString },
{ FC_FONTFORMAT, FcTypeString },
{ FC_EMBOLDEN, FcTypeBool },
+ { FC_EMBEDDED_BITMAP, FcTypeBool },
};
#define NUM_OBJECT_TYPES (sizeof _FcBaseObjectTypes / sizeof _FcBaseObjectTypes[0])
static const FcObjectTypeList _FcBaseObjectTypesList = {
0,
_FcBaseObjectTypes,
- NUM_OBJECT_TYPES
+ NUM_OBJECT_TYPES,
+ 0
};
static const FcObjectTypeList *_FcObjectTypes = &_FcBaseObjectTypesList;
for (l = _FcObjectTypes; l; l = l->next)
{
+ if (l == (FcObjectTypeList*)_FcUserObjectNames)
+ continue;
+
for (i = 0; i < l->ntypes; i++)
{
t = &l->types[i];
}
}
- /* We didn't match. Look for the correct FcObjectTypeList
- * to replace it in-place. */
+ /* We didn't match. Look for the application's FcObjectTypeList
+ * and replace it in-place. */
for (l = _FcObjectTypes; l; l = l->next)
{
if (l->types == _FcUserObjectNames)
return num + sizeof(int);
}
+int
+FcObjectNeededBytesAlign (void)
+{
+ return fc_alignof (int) + fc_alignof (char);
+}
+
void *
FcObjectDistributeBytes (FcCache * metadata, void * block_ptr)
{
+ block_ptr = ALIGN (block_ptr, int);
*(int *)block_ptr = biggest_known_ntypes;
block_ptr = (int *) block_ptr + 1;
+ block_ptr = ALIGN (block_ptr, char);
biggest_ptr = block_ptr;
block_ptr = (char *) block_ptr + biggest_known_count;
return block_ptr;
}
void
-FcObjectSerialize ()
+FcObjectSerialize (void)
{
int i;
for (i = 0; i < biggest_known_ntypes; i++)
}
void *
-FcObjectUnserialize (FcCache metadata, void *block_ptr)
+FcObjectUnserialize (FcCache * metadata, void *block_ptr)
{
int new_biggest;
+ block_ptr = ALIGN (block_ptr, int);
new_biggest = *(int *)block_ptr;
block_ptr = (int *) block_ptr + 1;
if (biggest_known_ntypes < new_biggest)
int i;
char * bp = (char *)block_ptr;
FcObjectType * bn;
- FcObjectTypeList * bnl;
bn = malloc (sizeof (const FcObjectType) * (new_biggest + 1));
if (!bn)
return 0;
- bnl = malloc (sizeof (FcObjectTypeList));
- if (!bnl)
- {
- free (bn);
- return 0;
- }
-
for (i = 0; i < new_biggest; i++)
{
const FcObjectType * t = FcNameGetObjectType(bp);
biggest_known_ntypes = new_biggest;
biggest_known_types = (const FcObjectType *)bn;
}
+ block_ptr = ALIGN (block_ptr, char);
block_ptr = (char *) block_ptr + biggest_known_count;
return block_ptr;
}
-int
-FcObjectPtrCompare (const FcObjectPtr a, const FcObjectPtr b)
-{
- return a - b;
-}
-
static const FcConstant _FcBaseConstants[] = {
{ (FcChar8 *) "thin", "weight", FC_WEIGHT_THIN, },
{ (FcChar8 *) "extralight", "weight", FC_WEIGHT_EXTRALIGHT, },
for (;;)
{
name = FcNameFindNext (name, ":,", save, &delim);
- if (t)
+ if (t && strcmp (t->object, _FcBaseObjectTypes[0].object))
{
v = FcNameConvert (t->type, save, &m);
if (!FcPatternAdd (pat, t->object, v, FcTrue))
static FcBool
FcNameUnparseValue (FcStrBuf *buf,
- int bank,
FcValue *v0,
FcChar8 *escape)
{
{
while (FcValueListPtrU(v))
{
- if (!FcNameUnparseValue (buf, v.bank, &FcValueListPtrU(v)->value, escape))
+ if (!FcNameUnparseValue (buf, &FcValueListPtrU(v)->value, escape))
return FcFalse;
if (FcValueListPtrU(v = FcValueListPtrU(v)->next))
if (!FcNameUnparseString (buf, (FcChar8 *) ",", 0))