diff options
| author | Adam Jackson <ajax@redhat.com> | 2009-01-20 22:42:22 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2009-01-20 22:42:22 -0500 |
| commit | 732191d5d6ad58caab25e24df16fb89efaea2e9a (patch) | |
| tree | 46d3e6dd808bda20fcd2f0cc76c8b910f3c385a6 /src/fontfile | |
| parent | 423d0a2c1dfad969f4a238618811937bc5f49776 (diff) | |
Remove loadable renderer support.
Diffstat (limited to 'src/fontfile')
| -rw-r--r-- | src/fontfile/ffcheck.c | 33 | ||||
| -rw-r--r-- | src/fontfile/register.c | 1 |
2 files changed, 2 insertions, 32 deletions
diff --git a/src/fontfile/ffcheck.c b/src/fontfile/ffcheck.c index fd94fd0..e7f8b85 100644 --- a/src/fontfile/ffcheck.c +++ b/src/fontfile/ffcheck.c @@ -35,7 +35,6 @@ in this Software without prior written authorization from The Open Group. #endif #include <X11/fonts/fntfilst.h> #include <X11/fonts/bitmap.h> -#include <X11/fonts/fontmod.h> /* * Map FPE functions to renderer functions @@ -114,46 +113,18 @@ FontFileCheckListNextFontOrAlias(pointer client, FontPathElementPtr fpe, return BadFontName; } -/* 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 FontFileCheckRegisterFpeFunctions (void) { - const FontModule *fmlist = builtinFontModuleList; - #ifdef XFONT_BITMAP /* bitmap is always builtin to libXfont now */ BitmapRegisterFontFileFunctions (); #endif -#ifdef LOADABLEFONTS - if (FontModuleList) { - fmlist = FontModuleList; - } +#ifdef XFONT_FREETYPE + FreeTypeRegisterFontFileFunctions(); #endif - if (fmlist) { - int i; - - for (i = 0; fmlist[i].name; i++) { - if (fmlist[i].initFunc) { - fmlist[i].initFunc(); - } - } - } - RegisterFPEFunctions(FontFileNameCheck, FontFileInitFPE, FontFileFreeFPE, diff --git a/src/fontfile/register.c b/src/fontfile/register.c index 6e60985..1a63cb3 100644 --- a/src/fontfile/register.c +++ b/src/fontfile/register.c @@ -33,7 +33,6 @@ in this Software without prior written authorization from The Open Group. #include <X11/fonts/fontmisc.h> #include <X11/fonts/fntfilst.h> #include <X11/fonts/bitmap.h> -#include <X11/fonts/fontmod.h> /* * Translate monolithic build symbols to modular build symbols. |