diff options
author | Adam Jackson <ajax@redhat.com> | 2009-01-20 22:33:06 -0500 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2009-01-20 22:33:06 -0500 |
commit | 50bca6dd881c2d787b3afa4d98a2c2667f767614 (patch) | |
tree | f793d1228636e8e5a2578673d337667eb082f370 /src/fontfile/register.c | |
parent | 6ba0565362ba9c8d1037c0e4725cb31faa141656 (diff) |
Get rid of a useless array
Diffstat (limited to 'src/fontfile/register.c')
-rw-r--r-- | src/fontfile/register.c | 42 |
1 files changed, 3 insertions, 39 deletions
diff --git a/src/fontfile/register.c b/src/fontfile/register.c index b8bb0b8..6e60985 100644 --- a/src/fontfile/register.c +++ b/src/fontfile/register.c @@ -23,13 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/register.c,v 1.14 2001/01/17 19:43:30 dawes Exp $ */ - -/* - * This is in a separate source file so that small programs - * such as mkfontdir that want to use the fontfile utilities don't - * end up dragging in code from all the renderers, which is not small. - */ #ifdef HAVE_CONFIG_H #include <config.h> @@ -53,45 +46,16 @@ in this Software without prior written authorization from The Open Group. # define XFONT_FREETYPE 1 #endif -/* Font renderers to initialize when not linked into something like - Xorg that provides its own module configuration options */ -static const FontModule builtinFontModuleList[] = { -#ifdef XFONT_FREETYPE - { - FreeTypeRegisterFontFileFunctions, - "freetype", - NULL - }, -#endif - /* List terminator - must be last entry */ - { NULL, NULL, NULL } -}; - void FontFileRegisterFpeFunctions(void) { - const FontModule *fmlist = builtinFontModuleList; - #ifdef XFONT_BITMAP /* bitmap is always builtin to libXfont now */ BitmapRegisterFontFileFunctions (); #endif - -#ifdef LOADABLEFONTS - if (FontModuleList) { - fmlist = FontModuleList; - } -#endif - - if (fmlist) { - int i; - - for (i = 0; fmlist[i].name; i++) { - if (fmlist[i].initFunc) { - fmlist[i].initFunc(); - } - } - } +#ifdef XFONT_FREETYPE + FreeTypeRegisterFontFileFunctions(); +#endif FontFileRegisterLocalFpeFunctions (); CatalogueRegisterLocalFpeFunctions (); |