#include "fcint.h"
-/* stub definitions for declarations from fcint.h.. */
-int * _fcBankId = 0, * _fcBankIdx = 0;
-
-int
-FcCacheBankToIndexMTF (int bank)
-{
- return 0;
-}
-/* end stub definitions */
-
static int
rawindex (const FcGlyphName *gn);
#define MAX_GLYPHNAME 10240
#define MAX_NAMELEN 1024
-FcGlyphName *raw[MAX_GLYPHNAME];
-int nraw;
-int max_name_len;
-FcGlyphName *name_to_ucs[MAX_GLYPHNAME*2];
-FcGlyphName *ucs_to_name[MAX_GLYPHNAME*2];
-int hash, rehash;
+static FcGlyphName *raw[MAX_GLYPHNAME];
+static int nraw;
+static int max_name_len;
+static FcGlyphName *name_to_ucs[MAX_GLYPHNAME*2];
+static FcGlyphName *ucs_to_name[MAX_GLYPHNAME*2];
+static unsigned int hash, rehash;
static int
rawindex (const FcGlyphName *gn)
i = (int) (h % hash);
while (table[i])
{
- if (!r) r = (int) (h % rehash);
+ if (!r) r = (int) (h % rehash + 1);
i += r;
if (i >= hash)
i -= hash;
static void
dump (FcGlyphName * const *table, const char *name)
{
- int i;
+ int i;
- printf ("static const FcGlyphName *%s[%d] = {\n", name, hash);
+ printf ("static const FcGlyphId %s[%d] = {\n", name, hash);
for (i = 0; i < hash; i++)
if (table[i])
- printf ("(FcGlyphName *) &glyph%d,\n", rawindex(table[i]));
+ printf (" %d,\n", rawindex(table[i]));
else
- printf ("0,\n");
+ printf (" -1,\n");
printf ("};\n");
}
char line[1024];
FILE *f;
int i;
+ char *type;
i = 0;
while (argv[i+1])
printf ("#define FC_GLYPHNAME_HASH %u\n", hash);
printf ("#define FC_GLYPHNAME_REHASH %u\n", rehash);
printf ("#define FC_GLYPHNAME_MAXLEN %d\n\n", max_name_len);
+ if (nraw < 128)
+ type = "int8_t";
+ else if (nraw < 32768)
+ type = "int16_t";
+ else
+ type = "int32_t";
+
+ printf ("typedef %s FcGlyphId;\n\n", type);
/*
* Dump out entries
*/
+ printf ("static const struct { const FcChar32 ucs; const FcChar8 name[%d]; } glyphs[%d] = {\n",
+ max_name_len + 1, nraw);
+
for (i = 0; i < nraw; i++)
- printf ("static const struct { const FcChar32 ucs; const FcChar8 name[%d]; }"
- " glyph%d = { 0x%lx, \"%s\" };\n",
- (int) strlen ((char *) raw[i]->name) + 1,
- i, (unsigned long) raw[i]->ucs, raw[i]->name);
+ printf (" { 0x%lx, \"%s\" },\n",
+ (unsigned long) raw[i]->ucs, raw[i]->name);
+
+ printf ("};\n");
/*
* Dump out name_to_ucs table