From a4367e0819da2b3e3b720c2b316f5b85ccfe4964 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Wed, 19 Jul 2000 16:17:55 +0000 Subject: [PATCH] Formatting. Fixing documentation. Removing unused configuration macros. --- include/freetype/config/ftconfig.h | 72 ++++--- include/freetype/config/ftoption.h | 308 +++++++++++++++-------------- src/cid/cidload.c | 2 +- src/raster1/ftraster.c | 2 +- 4 files changed, 195 insertions(+), 189 deletions(-) diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h index d5a404cae..c5511d5cf 100644 --- a/include/freetype/config/ftconfig.h +++ b/include/freetype/config/ftconfig.h @@ -7,8 +7,8 @@ /* Copyright 1996-2000 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ -/* This file is part of the FreeType project, and may only be used */ -/* modified and distributed under the terms of the FreeType project */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ /* license, LICENSE.TXT. By continuing to use, modify, or distribute */ /* this file you indicate that you have read the license and */ /* understand and accept it fully. */ @@ -19,27 +19,31 @@ /*************************************************************************/ /* */ /* This header file contains a number of macro definitions that are used */ - /* by the rest of the engine. Most of the macros here are automatically */ + /* by the rest of the engine. Most of the macros here are automatically */ /* determined at compile time, and you should not need to change it to */ - /* port FreeType, except to compile the library with a non ANSI compiler */ + /* port FreeType, except to compile the library with a non-ANSI */ + /* compiler. */ /* */ /* Note however that if some specific modifications are needed, we */ /* advise you to place a modified copy in your build directory. */ /* */ - /* The build directory is usually "freetype/config/", and */ + /* The build directory is usually `freetype/builds/', and */ /* contains system-specific files that are always included first when */ - /* building the library.. */ + /* building the library. */ /* */ - /* This ANSI version should stay in "freetype/config" */ + /* This ANSI version should stay in `include/freetype/config'. */ /* */ /*************************************************************************/ + #ifndef FTCONFIG_H #define FTCONFIG_H -/* Include the header file containing all developer build options */ + + /* Include the header file containing all developer build options */ #include + /*************************************************************************/ /* */ /* PLATFORM-SPECIFIC CONFIGURATION MACROS */ @@ -47,17 +51,11 @@ /* These macros can be toggled to suit a specific system. The current */ /* ones are defaults used to compile FreeType in an ANSI C environment */ /* (16bit compilers are also supported). Copy this file to your own */ - /* `freetype/arch/' directory, and edit it to port the engine. */ + /* `freetype/builds/' directory, and edit it to port the engine. */ /* */ /*************************************************************************/ -/* Define to empty if the keyword does not work. */ -/* #undef const */ - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - /* We use values to know the sizes of the types. */ #include @@ -82,26 +80,24 @@ #endif - /* Preferred alignment of data */ #define FT_ALIGNMENT 8 -/* UNUSED is a macro used to indicate that a given parameter is not used */ -/* this is only used to get rid of unpleasant compiler warnings.. */ +/* UNUSED is a macro used to indicate that a given parameter is not used -- */ +/* this is only used to get rid of unpleasant compiler warnings */ #ifndef FT_UNUSED -#define FT_UNUSED( arg ) ( (arg)=(arg) ) +#define FT_UNUSED( arg ) ( (arg) = (arg) ) #endif - /*************************************************************************/ /* */ /* AUTOMATIC CONFIGURATION MACROS */ /* */ - /* These macros are computed from the ones defined above. Don't touch */ - /* their definition, unless you know precisely what you're doing. No */ - /* porter should need to mess with them. */ + /* These macros are computed from the ones defined above. Don't touch */ + /* their definition, unless you know precisely what you are doing. No */ + /* porter should need to mess with them. */ /* */ /*************************************************************************/ @@ -126,12 +122,12 @@ typedef unsigned long FT_UInt32; #else -#error "no 32bit type found - please check your configuration files" +#error "no 32bit type found -- please check your configuration files" #endif #if FT_SIZEOF_LONG == 8 - /* FT_LONG64 must be defined when a 64-bit type is available */ + /* FT_LONG64 must be defined if a 64-bit type is available */ #define FT_LONG64 #define FT_INT64 long @@ -140,11 +136,13 @@ /*************************************************************************/ /* */ - /* many compilers provide the non-ANSI 'long long' 64-bit type. You can */ - /* activate it by defining the FTCALC_USE_LONG_LONG macro in `ftoption.h'*/ + /* Many compilers provide the non-ANSI `long long' 64-bit type. You can */ + /* activate it by defining the FTCALC_USE_LONG_LONG macro in */ + /* `ftoption.h'. */ + /* */ /* Note that this will produce many -ansi warnings during library */ - /* compilation, and that in many cases, the generated code will not be */ - /* smaller or faster !! */ + /* compilation, and that in many cases, the generated code will be */ + /* neither smaller nor faster! */ /* */ #ifdef FTCALC_USE_LONG_LONG @@ -152,7 +150,7 @@ #define FT_INT64 long long #endif /* FTCALC_USE_LONG_LONG */ -#endif +#endif /* FT_SIZEOF_LONG == 8 */ #ifdef FT_MAKE_OPTION_SINGLE_OBJECT @@ -164,23 +162,23 @@ #endif #ifdef FT_MAKE_OPTION_SINGLE_LIBRARY_OBJECT -#define BASE_DEF(x) static x -#define BASE_FUNC(x) static x +#define BASE_DEF( x ) static x +#define BASE_FUNC( x ) static x #else -#define BASE_DEF(x) extern x -#define BASE_FUNC(x) extern x +#define BASE_DEF( x ) extern x +#define BASE_FUNC( x ) extern x #endif #ifndef FT_EXPORT_DEF -#define FT_EXPORT_DEF(x) extern x +#define FT_EXPORT_DEF( x ) extern x #endif #ifndef FT_EXPORT_FUNC -#define FT_EXPORT_FUNC(x) extern x +#define FT_EXPORT_FUNC( x ) extern x #endif #ifndef FT_EXPORT_VAR -#define FT_EXPORT_VAR(x) extern x +#define FT_EXPORT_VAR( x ) extern x #endif #endif /* FTCONFIG_H */ diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h index 584f6e300..dbc8e363b 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -2,40 +2,43 @@ /* */ /* ftoption.h */ /* */ -/* User-selectable configuration macros. */ +/* User-selectable configuration macros (specification only). */ /* */ /* Copyright 1996-2000 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ -/* This file is part of the FreeType project, and may only be used */ -/* modified and distributed under the terms of the FreeType project */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ /* license, LICENSE.TXT. By continuing to use, modify, or distribute */ /* this file you indicate that you have read the license and */ /* understand and accept it fully. */ /* */ /***************************************************************************/ + #ifndef FTOPTION_H #define FTOPTION_H + /*************************************************************************/ /* */ /* USER-SELECTABLE CONFIGURATION MACROS */ /* */ /* These macros can be toggled by developers to enable or disable */ - /* certain aspects of FreeType. This is a default file, where all major */ + /* certain aspects of FreeType. This is a default file, where all major */ /* options are enabled. */ /* */ /* Note that if some modifications are required for your build, we */ /* advise you to put a modified copy of this file in your build */ /* directory, rather than modifying it in-place. */ /* */ - /* The build directory is normally "freetype/config/" and */ + /* The build directory is normally `freetype/builds/' and */ /* contains build or system-specific files that are included in */ /* priority when building the library. */ /* */ /*************************************************************************/ + /*************************************************************************/ /*************************************************************************/ /**** ****/ @@ -44,23 +47,25 @@ /*************************************************************************/ /*************************************************************************/ + /*************************************************************************/ /* */ /* Convenience functions support */ /* */ /* Some functions of the FreeType 2 API are provided as a convenience */ - /* for client applications and developers. However, they are not */ + /* for client applications and developers. However, they are not */ /* required to build and run the library itself. */ /* */ /* By defining this configuration macro, you'll disable the */ - /* compilation of these functions at build time. This can be useful */ + /* compilation of these functions at build time. This can be useful */ /* to reduce the library's code size when you don't need any of */ - /* these functions.. */ + /* these functions. */ /* */ /* All convenience functions are declared as such in their */ /* documentation. */ /* */ -#undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS +#undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS + /*************************************************************************/ /* */ @@ -68,17 +73,17 @@ /* */ /* By default, the glyph images returned by the FreeType glyph loader */ /* can either be a pixmap or a vectorial outline defined through */ - /* bezier control points. When defining the following configuration */ + /* Bezier control points. When defining the following configuration */ /* macro, some font drivers will be able to register alternate */ /* glyph image formats. */ /* */ - /* Unset this macro if you're sure that you'll never use a font driver */ - /* with an alternate glyph format, this will reduce the size of the */ - /* base layer code. */ + /* Unset this macro if you are sure that you will never use a font */ + /* driver with an alternate glyph format; this will reduce the size of */ + /* the base layer code. */ /* */ - /* Note that a few Type 1 fonts, as well as Windows "Vector" fonts */ - /* use a vector "plotter" format that isn't supported when this */ - /* macro is undefined.. */ + /* Note that a few Type 1 fonts, as well as Windows `vector' fonts */ + /* use a vector `plotter' format that isn't supported when this */ + /* macro is undefined. */ /* */ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS @@ -87,24 +92,23 @@ /* */ /* Glyph Postscript Names handling */ /* */ - /* By default, FreeType 2 is built with the "psnames" module compiled */ - /* in. This module is in charge of converting a glyph name string into */ - /* a Unicode value, or return a Macintosh standard glyph name for the */ - /* use with the TrueType "post" table. */ + /* By default, FreeType 2 is compiled with the `PSNames' module. This */ + /* This module is in charge of converting a glyph name string into a */ + /* Unicode value, or return a Macintosh standard glyph name for the */ + /* use with the TrueType `post' table. */ /* */ - /* Undefine this macro if you do not want the "psnames" compiled in */ - /* your build of FreeType. This has the following effects : */ + /* Undefine this macro if you do not want `PSNames' compiled in your */ + /* build of FreeType. This has the following effects: */ /* */ - /* - the TrueType driver will provide its own set of glyph names, */ + /* - The TrueType driver will provide its own set of glyph names, */ /* if you build it to support postscript names in the TrueType */ - /* "post" table. */ + /* `post' table. */ /* */ - /* - the Type 1 driver will not be able to synthetize a */ - /* Unicode charmap out of the glyphs found in the fonts. */ + /* - The Type 1 driver will not be able to synthetize a Unicode */ + /* charmap out of the glyphs found in the fonts. */ /* */ - /* You would normally undefine this configuration macro when */ - /* building a version of FreeType that doesn't contain a Type 1 */ - /* or CFF driver. */ + /* You would normally undefine this configuration macro when building */ + /* a version of FreeType that doesn't contain a Type 1 or CFF driver. */ /* */ #define FT_CONFIG_OPTION_POSTSCRIPT_NAMES @@ -113,61 +117,64 @@ /* */ /* Postscript Names to Unicode Values support */ /* */ - /* By default, FreeType 2 is built with the "psnames" module compiled */ - /* in. Among other things, the module is used to convert a glyph */ - /* name into a unicode value. This is especially useful in order to */ + /* By default, FreeType 2 is built with the `PSNames' module compiled */ + /* in. Among other things, the module is used to convert a glyph name */ + /* into a Unicode value. This is especially useful in order to */ /* synthetize on the fly a Unicode charmap from the CFF/Type 1 driver */ - /* through a big table named the "Adobe Glyph List". */ + /* through a big table named the `Adobe Glyph List' (AGL). */ /* */ /* Undefine this macro if you do not want the Adobe Glyph List */ - /* compiled in your "psnames" module. The Type 1 driver will not */ - /* be able to synthetize a Unicode charmap out of the glyphs found */ - /* in the fonts.. */ + /* compiled in your `PSNames' module. The Type 1 driver will not be */ + /* able to synthetize a Unicode charmap out of the glyphs found in the */ + /* fonts. */ /* */ #define FT_CONFIG_OPTION_ADOBE_GLYPH_LIST /*************************************************************************/ /* */ - /* many compilers provide the non-ANSI 'long long' 64-bit type. You can */ - /* activate it by defining the FTCALC_USE_LONG_LONG macro in `ftoption.h'*/ - /* Note that this will produce many -ansi warnings during library */ - /* compilation, and that in many cases, the generated code will not be */ - /* smaller or faster !! */ + /* Many compilers provide the non-ANSI `long long' 64-bit type. You can */ + /* activate it by defining the FTCALC_USE_LONG_LONG macro. Note that */ + /* this will produce many -ansi warnings during library compilation, and */ + /* that in many cases the generated code will not be smaller or faster! */ /* */ #undef FTCALC_USE_LONG_LONG /*************************************************************************/ /* */ - /* DLL Export Compilation */ + /* DLL export compilation */ /* */ - /* When compiling FreeType as a DLL, some systems/compilers need a */ - /* special keyword in front OR after the return type of function */ - /* declarations. */ + /* When compiling FreeType as a DLL, some systems/compilers need a */ + /* special keyword in front OR after the return type of function */ + /* declarations. */ /* */ - /* Two macros are used within the FreeType source code to define */ - /* exported library functions: FT_EXPORT_DEF and FT_EXPORT_FUNC */ + /* Two macros are used within the FreeType source code to define */ + /* exported library functions: FT_EXPORT_DEF and FT_EXPORT_FUNC. */ /* */ - /* FT_EXPORT_DEF(return_type) is used in a function declaration, as in: */ + /* FT_EXPORT_DEF( return_type ) */ /* */ - /* FT_EXPORT_DEF(FT_Error) FT_Init_FreeType( FT_Library *alibrary ); */ + /* is used in a function declaration, as in */ + /* */ + /* FT_EXPORT_DEF( FT_Error ) */ + /* FT_Init_FreeType( FT_Library* alibrary ); */ /* */ /* */ + /* FT_EXPORT_FUNC( return_type ) */ /* */ - /* FT_EXPORT_FUNC(return_type) is used in a function definition, as in: */ + /* is used in a function definition, as in */ /* */ - /* FT_EXPORT_FUNC(FT_Error) FT_Init_FreeType( FT_Library *alibrary ) */ - /* { */ - /* ... some code ... */ - /* return FT_Err_Ok; */ - /* } */ + /* FT_EXPORT_FUNC( FT_Error ) */ + /* FT_Init_FreeType( FT_Library* alibrary ) */ + /* { */ + /* ... some code ... */ + /* return FT_Err_Ok; */ + /* } */ /* */ - /* */ - /* You can provide your own implementation of FT_EXPORT_DEF and */ - /* FT_EXPORT_FUNC here if you want. If you leave them undefined, they'll */ - /* later be automatically defined as "extern return_type" to allow normal*/ - /* compilation.. */ + /* You can provide your own implementation of FT_EXPORT_DEF and */ + /* FT_EXPORT_FUNC here if you want. If you leave them undefined, they */ + /* will be later automatically defined as `extern return_type' to */ + /* allow normal compilation. */ /* */ #undef FT_EXPORT_DEF #undef FT_EXPORT_FUNC @@ -175,21 +182,21 @@ /*************************************************************************/ /* */ - /* 5-levels Anti Aliasing support: */ + /* 5-levels Anti Aliasing support */ /* */ - /* FreeType 2 provides a new "smooth" renderer that is capable of */ - /* producing anti-aliased glyph bitmaps with up to 256 gray-levels. */ + /* FreeType 2 provides a new `smooth' renderer that is capable of */ + /* producing anti-aliased glyph bitmaps with up to 256 gray-levels. */ /* */ - /* However, for compatibility purposes with FreeType 1.x, the standard */ - /* raster is still capable of generating anti-aliased bitmaps with 5 */ - /* gray levels. */ + /* However, for compatibility purposes with FreeType 1.x, the standard */ + /* raster is still capable of generating anti-aliased bitmaps with */ + /* 5 gray levels. */ /* */ - /* If you do not need this capability (i.e. if you always use the */ - /* "smooth" renderer for anti-aliased glyphs), we suggest you to */ - /* undefine this configuration macro, as it will save both code and */ - /* memory.. */ + /* If you do not need this capability (i.e., if you always use the */ + /* `smooth' renderer for anti-aliased glyphs), we suggest you to */ + /* undefine this configuration macro, as it will save both code and */ + /* memory. */ /* */ -#define FT_CONFIG_OPTION_5_GRAY_LEVELS +#undef FT_CONFIG_OPTION_5_GRAY_LEVELS /*************************************************************************/ @@ -204,70 +211,51 @@ /* Define FT_DEBUG_LEVEL_ERROR to build the library in debug mode. */ /* Define FT_DEBUG_LEVEL_TRACE to build it in trace mode. */ /* */ - /* Don't define any of these macros to compile in `release' mode. */ + /* Don't define any of these macros to compile in `release' mode! */ /* */ #define FT_DEBUG_LEVEL_ERROR #define FT_DEBUG_LEVEL_TRACE - /*************************************************************************/ - /* */ - /* Endianess performance improvement */ - /* */ - /* FreeType is completely endian-independent, and can thus be compiled */ - /* directly on _any_ machine. However, some components of the library */ - /* provide improved routines for the cases where endianess is known. */ - /* */ - /* It usually results in speed-ups and reduced code size. Note that */ - /* you should not define both of these macros. */ - /* */ - /* */ - /* NOTE: For now, only the scan-line converter (base/ftraster.c) uses */ - /* these macros to speed-up some anti-alias rendering routines. */ - /* */ -#undef FT_CONFIG_OPTION_LITTLE_ENDIAN -#undef FT_CONFIG_OPTION_BIG_ENDIAN - - /*************************************************************************/ /* */ /* Computation Algorithms */ /* */ /* Used for debugging, this configuration macro should disappear */ - /* soon.. */ + /* soon. */ /* */ #define FT_CONFIG_OPTION_OLD_CALCS /*************************************************************************/ /* */ - /* The size in bytes of the render pool used by the scan-line */ - /* converter to do all of its work. */ + /* The size in bytes of the render pool used by the scan-line converter */ + /* to do all of its work. */ /* */ - /* This must be greater than 4 Kb */ + /* This must be greater than 4kByte. */ /* */ -#define FT_RENDER_POOL_SIZE 16384 +#define FT_RENDER_POOL_SIZE 16384 /*************************************************************************/ /* */ - /* FT_MAX_MODULES */ + /* FT_MAX_MODULES */ /* */ - /* The maximum number ofmodules that can be registered in a single */ - /* FreeType library object. 16 seems to be a good choice for now :-) */ + /* The maximum number of modules that can be registered in a single */ + /* FreeType library object. 16 is the default. */ /* */ #define FT_MAX_MODULES 16 /*************************************************************************/ /* */ - /* FT_MAX_EXTENSIONS */ + /* FT_MAX_EXTENSIONS */ /* */ - /* The maximum number of extensions that can be registered in a */ - /* single font driver. 8 seems to be a good choice for now.. */ + /* The maximum number of extensions that can be registered in a single */ + /* font driver. 8 is the default. */ /* */ - /* If you don't know what this means, you certainly do not need to */ - /* change this value.. */ + /* If you don't know what this means, you certainly do not need to */ + /* change this value. */ /* */ #define FT_MAX_EXTENSIONS 8 @@ -280,13 +268,14 @@ /*************************************************************************/ /*************************************************************************/ + /*************************************************************************/ /* */ /* Define TT_CONFIG_OPTION_EMBEDDED_BITMAPS if you want to support */ /* embedded bitmaps in all formats using the SFNT module (namely */ /* TrueType & OpenType). */ /* */ -#define TT_CONFIG_OPTION_EMBEDDED_BITMAPS +#define TT_CONFIG_OPTION_EMBEDDED_BITMAPS /*************************************************************************/ @@ -295,13 +284,13 @@ /* load and enumerate the glyph Postscript names in a TrueType or */ /* OpenType file. */ /* */ - /* Note that when you do not compile the "psnames" module by undefining */ - /* the above FT_CONFIG_OPTION_POSTSCRIPT_NAMES, the "sfnt" module will */ + /* Note that when you do not compile the `PSNames' module by undefining */ + /* the above FT_CONFIG_OPTION_POSTSCRIPT_NAMES, the `sfnt' module will */ /* contain additional code used to read the PS Names table from a font. */ /* */ - /* (by default, the module uses "psnames" to extract glyph names).. */ + /* (By default, the module uses `PSNames' to extract glyph names.) */ /* */ -#define TT_CONFIG_OPTION_POSTSCRIPT_NAMES +#define TT_CONFIG_OPTION_POSTSCRIPT_NAMES /*************************************************************************/ @@ -315,23 +304,24 @@ /*************************************************************************/ /* */ /* Define TT_CONFIG_OPTION_BYTECODE_INTERPRETER if you want to compile */ - /* a bytecode interpreter in the TrueType driver. Note that there are */ + /* a bytecode interpreter in the TrueType driver. Note that there are */ /* important patent issues related to the use of the interpreter. */ /* */ - /* By undefining this, you'll only compile the code necessary to load */ - /* TrueType glyphs without hinting.. */ + /* By undefining this, you will only compile the code necessary to load */ + /* TrueType glyphs without hinting. */ /* */ -#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER +#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER + /*************************************************************************/ /* */ /* Define TT_CONFIG_OPTION_INTERPRETER_SWITCH to compile the TrueType */ - /* bytecode interpreter with a huge switch statement, rather than a */ - /* call table. This results in smaller and faster code for a number of */ + /* bytecode interpreter with a huge switch statement, rather than a call */ + /* table. This results in smaller and faster code for a number of */ /* architectures. */ /* */ /* Note however that on some compiler/processor combinations, undefining */ - /* this macro will generate a faster, though larger, code. */ + /* this macro will generate faster, though larger, code. */ /* */ #define TT_CONFIG_OPTION_INTERPRETER_SWITCH @@ -344,48 +334,66 @@ /*************************************************************************/ /*************************************************************************/ -/********************************************************************/ -/* T1_MAX_STACK_DEPTH is the maximal depth of the token stack used */ -/* by the Type 1 parser (see t1load.c). A minimum of 16 is required */ -/* */ + + /*************************************************************************/ + /* */ + /* T1_MAX_STACK_DEPTH is the maximal depth of the token stack used by */ + /* the Type 1 parser (see t1load.c). A minimum of 16 is required. */ + /* */ #define T1_MAX_STACK_DEPTH 16 -/*******************************************************************/ -/* T1_MAX_DICT_DEPTH is the maximal depth of nest dictionaries and */ -/* arrays in the Type 1 stream (see t1load.c). A minimum of 4 is */ -/* required */ -#define T1_MAX_DICT_DEPTH 5 -/***********************************************************************/ -/* T1_MAX_SUBRS_CALLS details the maximum number of nested sub-routine */ -/* calls during glyph loading */ -#define T1_MAX_SUBRS_CALLS 8 + /*************************************************************************/ + /* */ + /* T1_MAX_DICT_DEPTH is the maximal depth of nest dictionaries and */ + /* arrays in the Type 1 stream (see t1load.c). A minimum of 4 is */ + /* required. */ + /* */ +#define T1_MAX_DICT_DEPTH 5 -/*****************************************************************/ -/* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity */ + + /*************************************************************************/ + /* */ + /* T1_MAX_SUBRS_CALLS details the maximum number of nested sub-routine */ + /* calls during glyph loading. */ + /* */ +#define T1_MAX_SUBRS_CALLS 8 + + /*************************************************************************/ + /* */ + /* T1_MAX_CHARSTRING_OPERANDS is the charstring stack's capacity. */ + /* */ #define T1_MAX_CHARSTRINGS_OPERANDS 32 -/*******************************************************************/ -/* Define T1_CONFIG_OPTION_DISABLE_HINTER if you want to generate */ -/* a driver with no hinter. This can be useful to debug the parser */ -/* */ -#undef T1_CONFIG_OPTION_DISABLE_HINTER + /*************************************************************************/ + /* */ + /* Define T1_CONFIG_OPTION_DISABLE_HINTER if you want to generate a */ + /* driver with no hinter. This can be useful to debug the parser. */ + /* */ +#undef T1_CONFIG_OPTION_DISABLE_HINTER -/*******************************************************************/ -/* Define this configuration macro if you want to prevent the */ -/* compilation of "t1afm", which is in charge of reading Type1 */ -/* AFM files into an existing face. Note that when set, the T1 */ -/* driver will be unable to produce kerning distances.. */ -/* */ -#undef T1_CONFIG_OPTION_NO_AFM -/*******************************************************************/ -/* Define this configuration macro if you want to prevent the */ -/* compilation of the multiple-masters support in the Type 1 driver*/ -/* AFM files into an existing face. Note that when set, the T1 */ -/* driver will be unable to produce kerning distances.. */ -/* */ -#undef T1_CONFIG_OPTION_NO_MM_SUPPORT + /*************************************************************************/ + /* */ + /* Define this configuration macro if you want to prevent the */ + /* compilation of `t1afm', which is in charge of reading Type 1 AFM */ + /* files into an existing face. Note that if set, the T1 driver will be */ + /* unable to produce kerning distances. */ + /* */ +#undef T1_CONFIG_OPTION_NO_AFM + + + /*************************************************************************/ + /* */ + /* Define this configuration macro if you want to prevent the */ + /* compilation of the Multiple Masters font support in the Type 1 */ + /* driver. */ + /* */ +#undef T1_CONFIG_OPTION_NO_MM_SUPPORT + #endif /* FTOPTION_H */ + + +/* END */ diff --git a/src/cid/cidload.c b/src/cid/cidload.c index 02e4acb0a..1f7c7aea0 100644 --- a/src/cid/cidload.c +++ b/src/cid/cidload.c @@ -260,7 +260,7 @@ #endif - { 0, 0, 0, 0, 0, 0, 0, 0 } + { 0, t1_field_cid_info, t1_field_none, 0, 0, 0, 0, 0 } }; diff --git a/src/raster1/ftraster.c b/src/raster1/ftraster.c index 59be3c769..65d04057d 100644 --- a/src/raster1/ftraster.c +++ b/src/raster1/ftraster.c @@ -112,7 +112,7 @@ /* undefine FT_RASTER_OPTION_ANTI_ALIASING if you do not want to support */ /* 5-levels anti-aliasing */ -#ifdef xxxFT_CONFIG_OPTION_5_GRAY_LEVELS +#ifdef FT_CONFIG_OPTION_5_GRAY_LEVELS #define FT_RASTER_OPTION_ANTI_ALIASING #endif