diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-12-01 00:41:41 +0200 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-12-06 23:24:23 +0200 |
| commit | d17ec01e8395a8f14b75a10c8bf082b3f5a4fb36 (patch) | |
| tree | 9972e7b211b8d7f8b0403ead51422b47953e3cc3 /hw | |
| parent | abe5e079af715713097ab0daad29a3e9f523c398 (diff) | |
remove CID support (bug #5553)
Remove CID from all our fontpaths.
(cherry picked from 69820a10e33e4582c192360996e866007114639d commit)
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/Makefile.am | 1 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/type1mod.c | 15 | ||||
| -rw-r--r-- | hw/xfree86/doc/man/xorg.conf.man.pre | 2 | ||||
| -rw-r--r-- | hw/xfree86/xorgconf.cpp | 1 |
4 files changed, 0 insertions, 19 deletions
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index b373242e8..0c1306f09 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -93,7 +93,6 @@ CPP_FILES_FLAGS = \ -DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \ -DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \ -DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \ - -DCIDFONTPATH="\"$(BASE_FONT_PATH)/CID\"" \ -DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi\"" \ -DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi\"" \ -DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\" diff --git a/hw/xfree86/dixmods/type1mod.c b/hw/xfree86/dixmods/type1mod.c index 48c1d0421..3da53eae5 100644 --- a/hw/xfree86/dixmods/type1mod.c +++ b/hw/xfree86/dixmods/type1mod.c @@ -57,9 +57,6 @@ static XF86ModuleVersionInfo VersRec = _X_EXPORT XF86ModuleData type1ModuleData = { &VersRec, type1Setup, NULL }; extern void Type1RegisterFontFileFunctions(void); -#ifdef BUILDCID -extern void CIDRegisterFontFileFunctions(void); -#endif FontModule type1Module = { Type1RegisterFontFileFunctions, @@ -67,23 +64,11 @@ FontModule type1Module = { NULL }; -#ifdef BUILDCID -FontModule CIDModule = { - CIDRegisterFontFileFunctions, - "CID", - NULL -}; -#endif - static pointer type1Setup(pointer module, pointer opts, int *errmaj, int *errmin) { type1Module.module = module; LoadFont(&type1Module); -#ifdef BUILDCID - CIDModule.module = module; - LoadFont(&CIDModule); -#endif /* Need a non-NULL return */ return (pointer)1; diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre index abf31468a..8d52b2bcf 100644 --- a/hw/xfree86/doc/man/xorg.conf.man.pre +++ b/hw/xfree86/doc/man/xorg.conf.man.pre @@ -311,7 +311,6 @@ font path elements: .I __projectroot__/lib/X11/fonts/misc/ .I __projectroot__/lib/X11/fonts/TTF/ .I __projectroot__/lib/X11/fonts/Type1/ -.I __projectroot__/lib/X11/fonts/CID/ .I __projectroot__/lib/X11/fonts/75dpi/ .I __projectroot__/lib/X11/fonts/100dpi/ .fi @@ -326,7 +325,6 @@ The recommended font path contains the following font path elements: .I __projectroot__/lib/X11/fonts/75dpi/:unscaled .I __projectroot__/lib/X11/fonts/100dpi/:unscaled .I __projectroot__/lib/X11/fonts/Type1/ -.I __projectroot__/lib/X11/fonts/CID/ .I __projectroot__/lib/X11/fonts/Speedo/ .I __projectroot__/lib/X11/fonts/75dpi/ .I __projectroot__/lib/X11/fonts/100dpi/ diff --git a/hw/xfree86/xorgconf.cpp b/hw/xfree86/xorgconf.cpp index 71abe130d..1995045b8 100644 --- a/hw/xfree86/xorgconf.cpp +++ b/hw/xfree86/xorgconf.cpp @@ -56,7 +56,6 @@ XCOMM command (or a combination of both methods) FontPath MISCFONTPATH FontPath T1FONTPATH FontPath TRUETYPEFONTPATH - FontPath CIDFONTPATH FontPath DPI75FONTPATH FontPath DPI100FONTPATH |