diff options
81 files changed, 311 insertions, 343 deletions
@@ -1,8 +1,27 @@ +2000-12-12 Werner Lemberg <wl@gnu.org> + + * include/freetype/config/ft2build.h (FT2_ROOT, FT2_CONFIG_ROOT): + Removed. ANSI C doesn't (explicitly) allow macro expansion in + arguments using `##'. + (FT2_PUBLIC_FILE, FT2_CONFIG_FILE, FT2_INTERNAL_FILE): Use directory + names directly. Make them configurable. Use `##' to strip leading + and trailing spaces from arguments. + + * builds/unix/ft2unix.h: Adapted. + + * src/base/ftsystem.c (ft_alloc, ft_realloc, ft_free, ft_io_stream, + ft_close_stream): Use FT_CALLBACK_DEF. + + * builds/unix/ftsystem.c: Use new header scheme. + (FT_Done_Memory): Use free() from FT_Memory structure. + + * src/base/ftinit.c, src/base/ftmac.c: Header scheme fixes. + 2000-12-11 Werner Lemberg <wl@gnu.org> - * include/freetype/config/build.h (FT2_CONFIG_ROOT, FT2_PUBLIC_FILE, - FT2_CONFIG_FILE, FT2_INTERNAL_FILE, FT_SOURCE_FILE): Use `##' - operator to be really ANSI C compliant. + * include/freetype/config/ft2build.h (FT2_CONFIG_ROOT, + FT2_PUBLIC_FILE, FT2_CONFIG_FILE, FT2_INTERNAL_FILE, + FT_SOURCE_FILE): Use `##' operator to be really ANSI C compliant. 2000-12-09 Werner Lemberg <wl@gnu.org> diff --git a/builds/unix/ft2unix.h b/builds/unix/ft2unix.h index 364df570..b5478cf6 100644 --- a/builds/unix/ft2unix.h +++ b/builds/unix/ft2unix.h @@ -13,22 +13,30 @@ /* this file you indicate that you have read the license and */ /* understand and accept it fully. */ /* */ -/* */ -/* This is a Unix-specific version of <ft2build.h> that should be */ -/* used exclusively _once_ the library has been installed on the */ -/* system. */ -/* */ -/* currently, the FreeType 2 root is at "freetype2/freetype", though */ -/* it will change to a simple "freetype2" in the near future.. */ -/* */ /***************************************************************************/ + + /*************************************************************************/ + /* */ + /* This is a Unix-specific version of <ft2build.h> that should be used */ + /* exclusively *after* installation of the library. */ + /* */ + /* Currently, the FreeType 2 root is at "freetype2/freetype", though it */ + /* will change to "freetype2" in the near future. */ + /* */ + /*************************************************************************/ + + #ifndef __FT2_BUILD_UNIX_H__ #define __FT2_BUILD_UNIX_H__ -#define FT2_ROOT freetype2/freetype -#include <FT2_ROOT/config/ft2build.h> +#define FT2_PUBLIC_FILE( x ) <freetype2/freetype/ ## x ## > +#define FT2_CONFIG_FILE( x ) <freetype2/freetype/config/ ## x ## > +#define FT2_INTERNAL_FILE( x ) <freetype2/freetype/internal/ ## x ## > + +#include FT2_CONFIG_FILE( ft2build.h ) #endif /* __FT2_BUILD_UNIX_H__ */ + /* END */ diff --git a/builds/unix/ftsystem.c b/builds/unix/ftsystem.c index f365c95e..39e687aa 100644 --- a/builds/unix/ftsystem.c +++ b/builds/unix/ftsystem.c @@ -16,17 +16,13 @@ /***************************************************************************/ -#include <ftconfig.h> -#include <freetype/internal/ftdebug.h> -#include <freetype/ftsystem.h> -#include <freetype/fterrors.h> -#include <freetype/fttypes.h> -#include <freetype/internal/ftobjs.h> - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - +#include <ft2build.h> +#include FT_CONFIG_CONFIG_H +#include FT_INTERNAL_DEBUG_H +#include FT_SYSTEM_H +#include FT_ERRORS_H +#include FT_TYPES_h +#include FT_INTERNAL_FTOBJS_H /* memory-mapping includes and definitions */ #ifdef HAVE_UNISTD_H @@ -87,10 +83,11 @@ /* */ /* <Input> */ /* memory :: A pointer to the memory object. */ + /* */ /* size :: The requested size in bytes. */ /* */ /* <Return> */ - /* block :: The address of newly allocated block. */ + /* The address of newly allocated block. */ /* */ FT_CALLBACK_DEF void* ft_alloc( FT_Memory memory, @@ -201,23 +198,8 @@ } - /*************************************************************************/ - /* */ - /* <Function> */ - /* FT_New_Stream */ - /* */ - /* <Description> */ - /* Creates a new stream object. */ - /* */ - /* <Input> */ - /* filepathname :: The name of the stream (usually a file) to be */ - /* opened. */ - /* */ - /* stream :: A pointer to the stream object. */ - /* */ - /* <Return> */ - /* FreeType error code. 0 means success. */ - /* */ + /* documentation is in ftobjs.h */ + FT_EXPORT_DEF( FT_Error ) FT_New_Stream( const char* filepathname, FT_Stream stream ) { @@ -285,17 +267,8 @@ } - /*************************************************************************/ - /* */ - /* <Function> */ - /* FT_New_Memory */ - /* */ - /* <Description> */ - /* Creates a new memory object. */ - /* */ - /* <Return> */ - /* A pointer to the new memory object. 0 in case of error. */ - /* */ + /* documentation is in ftobjs.h */ + FT_EXPORT_DEF( FT_Memory ) FT_New_Memory( void ) { FT_Memory memory; @@ -314,20 +287,11 @@ } - /*************************************************************************/ - /* */ - /* <Function> */ - /* FT_Done_Memory */ - /* */ - /* <Description> */ - /* Discards memory manager. */ - /* */ - /* <Input> */ - /* memory :: A handle to the memory manager. */ - /* */ + /* documentation is in ftobjs.h */ + FT_EXPORT_DEF( void ) FT_Done_Memory( FT_Memory memory ) { - free( memory ); + memory->free( memory, memory ); } diff --git a/include/freetype/config/ft2build.h b/include/freetype/config/ft2build.h index b02c1140..9c796892 100644 --- a/include/freetype/config/ft2build.h +++ b/include/freetype/config/ft2build.h @@ -21,18 +21,24 @@ /* This file corresponds to the default "ft2build.h" file for */ /* FreeType 2. It uses the "freetype" include root. */ /* */ - /* Note that specific platforms might use a different configurations. */ - /* For example, on Unix, the "freetype2" include root is used, with a */ - /* specific "ft2build.h" used to take care of this. The latter looks */ - /* like the following: */ + /* Note that specific platforms might use a different configuration. */ + /* For example, on Unix, the "freetype2" include root could be used, */ + /* with a specific "ft2build.h" to take care of this. The latter then */ + /* looks like the following: */ /* */ - /* #ifndef __FT_BUILD_UNIX_H__ */ - /* #define __FT_BUILD_UNIX_H__ */ + /* #ifndef __FT2_BUILD_UNIX_H__ */ + /* #define __FT2_BUILD_UNIX_H__ */ /* */ - /* #define FT2_ROOT freetype2 */ - /* #include <FT2_ROOT/config/ft2build.h> */ + /* #define FT2_PUBLIC_FILE( x ) <freetype2/ ## x ## > */ + /* #define FT2_CONFIG_FILE( x ) <freetype2/config/ ## x ## > */ + /* #define FT2_INTERNAL_FILE( x ) <freetype2/internal/ ## x ## > */ /* */ - /* #endif // __FT_BUILD_UNIX_H__ */ + /* #include FT2_CONFIG_FILE( ft2build.h ) */ + /* */ + /* #endif */ + /* */ + /* If necessary, the macro FT_SOURCE_FILE() can be redefined also if a */ + /* different path separator is needed. */ /* */ /*************************************************************************/ @@ -41,58 +47,30 @@ #define __FT2_BUILD_H__ - /*************************************************************************/ - /* */ - /* The macro FT2_ROOT is used to define the root of all public header */ - /* files for FreeType 2. By default, it is set to "freetype", which */ - /* means that all public files should be included with a line like: */ - /* */ - /* #include <freetype/...> */ - /* */ - /* Redefine it to something different if necessary, depending where the */ - /* library is installed on the particular system. */ - /* */ -#ifndef FT2_ROOT -#define FT2_ROOT freetype -#endif + /* We use `##' around some arguments to eliminate leading and trailing */ + /* spaces. */ /*************************************************************************/ /* */ - /* The macro FT2_CONFIG_ROOT is used to define the root of all */ - /* configuration header files for FreeType 2. By default, it is set to */ - /* "freetype/config", which means that all config files should be */ - /* include with a line like: */ - /* */ - /* #include <freetype/config/...> */ + /* The macro FT2_PUBLIC_FILE is used to include a FreeType 2 public */ + /* file. Its parameter is the file pathname, relative to the public */ + /* root of a given header file. */ /* */ - /* Redefine it to something different, depending where the library is */ - /* installed on the particular system. */ - /* */ -#ifndef FT2_CONFIG_ROOT -#define FT2_CONFIG_ROOT_( x ) x ## / ## config -#define FT2_CONFIG_ROOT FT2_CONFIG_ROOT_(FT2_ROOT) +#ifndef FT2_PUBLIC_FILE +#define FT2_PUBLIC_FILE( x ) <freetype/ ## x ## > #endif /*************************************************************************/ /* */ - /* The macro FT2_PUBLIC_FILE is used to include a FreeType 2 public file.*/ - /* Its parameter is the file pathname, relative to the public root of a */ - /* given header file. */ - /* */ -#define FT2_PUBLIC_FILE_( x, y ) < ## x ## / ## y ## > -#define FT2_PUBLIC_FILE( x ) FT2_PUBLIC_FILE_(FT2_ROOT,x) - - - /*************************************************************************/ - /* */ - /* The macro FT2_CONFIG_FILE is used to include a FreeType 2 config file.*/ - /* Its parameter is the file pathname, relative to the configuration */ - /* root directory of a given header file. */ + /* The macro FT2_CONFIG_FILE is used to include a FreeType 2 config */ + /* file. Its parameter is the file pathname, relative to the */ + /* configuration root directory of a given header file. */ /* */ -#define FT2_CONFIG_FILE_( x, y ) < ## x ## / ## y ## > -#define FT2_CONFIG_FILE( x ) FT2_CONFIG_FILE_(FT2_CONFIG_ROOT,x) +#ifndef FT2_CONFIG_FILE +#define FT2_CONFIG_FILE( x ) <freetype/config/ ## x ## > +#endif /*************************************************************************/ @@ -101,8 +79,9 @@ /* file. Its parameter is the file pathname, relative to the */ /* configuration root directory of a given header file. */ /* */ -#define FT2_INTERNAL_FILE_( x, y ) < ## x ## / ## internal ## / ## y ## > -#define FT2_INTERNAL_FILE( x ) FT2_INTERNAL_FILE_(FT2_ROOT,x) +#ifndef FT2_INTERNAL_FILE +#define FT2_INTERNAL_FILE( x ) <freetype/internal/ ## x ## > +#endif /*************************************************************************/ @@ -119,12 +98,16 @@ /* directory and compile them normally by defining the macro */ /* FT_FLAT_COMPILATION. */ /* */ +#ifndef FT_SOURCE_FILE + #ifdef FT_FLAT_COMPILATION #define FT_SOURCE_FILE( d, x ) #x #else #define FT_SOURCE_FILE( d, x ) < ## d ## / ## x ## > #endif +#endif /* !FT_SOURCE_FILE */ + /*************************************************************************/ /* */ @@ -168,48 +151,46 @@ /* */ /*************************************************************************/ - /* don't add spaces around arguments to FT2_CONFIG_FILE! */ - /* configuration files */ #ifndef FT_CONFIG_CONFIG_H -#define FT_CONFIG_CONFIG_H FT2_CONFIG_FILE(ftconfig.h) +#define FT_CONFIG_CONFIG_H FT2_CONFIG_FILE( ftconfig.h ) #endif #ifndef FT_CONFIG_OPTIONS_H -#define FT_CONFIG_OPTIONS_H FT2_CONFIG_FILE(ftoption.h) +#define FT_CONFIG_OPTIONS_H FT2_CONFIG_FILE( ftoption.h ) #endif #ifndef FT_CONFIG_MODULES_H -#define FT_CONFIG_MODULES_H FT2_CONFIG_FILE(ftmodule.h) +#define FT_CONFIG_MODULES_H FT2_CONFIG_FILE( ftmodule.h ) #endif /* public headers */ -#define FT_ERRORS_H FT2_PUBLIC_FILE(fterrors.h) -#define FT_SYSTEM_H FT2_PUBLIC_FILE(ftsystem.h) -#define FT_IMAGE_H FT2_PUBLIC_FILE(ftimage.h) - -#define FT_TYPES_H FT2_PUBLIC_FILE(fttypes.h) - -#define FT_FREETYPE_H FT2_PUBLIC_FILE(freetype.h) -#define FT_GLYPH_H FT2_PUBLIC_FILE(ftglyph.h) -#define FT_BBOX_H FT2_PUBLIC_FILE(ftbbox.h) -#define FT_CACHE_H FT2_PUBLIC_FILE(ftcache.h) -#define FT_LIST_H FT2_PUBLIC_FILE(ftlist.h) -#define FT_MAC_H FT2_PUBLIC_FILE(ftmac.h) -#define FT_MULTIPLE_MASTERS_H FT2_PUBLIC_FILE(ftmm.h) -#define FT_MODULE_H FT2_PUBLIC_FILE(ftmodule.h) -#define FT_NAMES_H FT2_PUBLIC_FILE(ftnames.h) -#define FT_OUTLINE_H FT2_PUBLIC_FILE(ftoutln.h) -#define FT_RENDER_H FT2_PUBLIC_FILE(ftrender.h) -#define FT_SYNTHESIS_H FT2_PUBLIC_FILE(ftsynth.h) -#define FT_TYPE1_TABLES_H FT2_PUBLIC_FILE(t1tables.h) -#define FT_TRUETYPE_NAMES_H FT2_PUBLIC_FILE(ttnameid.h) -#define FT_TRUETYPE_TABLES_H FT2_PUBLIC_FILE(tttables.h) -#define FT_TRUETYPE_TAGS_H FT2_PUBLIC_FILE(tttags.h) +#define FT_ERRORS_H FT2_PUBLIC_FILE( fterrors.h ) +#define FT_SYSTEM_H FT2_PUBLIC_FILE( ftsystem.h ) +#define FT_IMAGE_H FT2_PUBLIC_FILE( ftimage.h ) + +#define FT_TYPES_H FT2_PUBLIC_FILE( fttypes.h ) + +#define FT_FREETYPE_H FT2_PUBLIC_FILE( freetype.h ) +#define FT_GLYPH_H FT2_PUBLIC_FILE( ftglyph.h ) +#define FT_BBOX_H FT2_PUBLIC_FILE( ftbbox.h ) +#define FT_CACHE_H FT2_PUBLIC_FILE( ftcache.h ) +#define FT_LIST_H FT2_PUBLIC_FILE( ftlist.h ) +#define FT_MAC_H FT2_PUBLIC_FILE( ftmac.h ) +#define FT_MULTIPLE_MASTERS_H FT2_PUBLIC_FILE( ftmm.h ) +#define FT_MODULE_H FT2_PUBLIC_FILE( ftmodule.h ) +#define FT_NAMES_H FT2_PUBLIC_FILE( ftnames.h ) +#define FT_OUTLINE_H FT2_PUBLIC_FILE( ftoutln.h ) +#define FT_RENDER_H FT2_PUBLIC_FILE( ftrender.h ) +#define FT_SYNTHESIS_H FT2_PUBLIC_FILE( ftsynth.h ) +#define FT_TYPE1_TABLES_H FT2_PUBLIC_FILE( t1tables.h ) +#define FT_TRUETYPE_NAMES_H FT2_PUBLIC_FILE( ttnameid.h ) +#define FT_TRUETYPE_TABLES_H FT2_PUBLIC_FILE( tttables.h ) +#define FT_TRUETYPE_TAGS_H FT2_PUBLIC_FILE( tttags.h ) /* now include internal headers definitions from <freetype/internal/...> */ -#include FT2_INTERNAL_FILE(internal.h) +#include FT2_INTERNAL_FILE( internal.h ) #endif /* __FT2_BUILD_H__ */ diff --git a/include/freetype/fttypes.h b/include/freetype/fttypes.h index 962a723b..1e6f9dd1 100644 --- a/include/freetype/fttypes.h +++ b/include/freetype/fttypes.h @@ -23,6 +23,7 @@ #include <ft2build.h> #include FT_SYSTEM_H #include FT_IMAGE_H + #include <stddef.h> diff --git a/include/freetype/internal/internal.h b/include/freetype/internal/internal.h index f0c20b60..e75fa359 100644 --- a/include/freetype/internal/internal.h +++ b/include/freetype/internal/internal.h @@ -18,39 +18,37 @@ /*************************************************************************/ /* */ - /* This file is automatically included by `ftbuild.h'. */ + /* This file is automatically included by `ft2build.h'. */ /* Do not include it manually! */ /* */ /*************************************************************************/ - /* don't add spaces around the argument of FT2_INTERNAL_FILE! */ +#define FT_INTERNAL_OBJECTS_H FT2_INTERNAL_FILE( ftobjs.h ) +#define FT_INTERNAL_STREAM_H FT2_INTERNAL_FILE( ftstream.h ) +#define FT_INTERNAL_MEMORY_H FT2_INTERNAL_FILE( ftmemory.h ) +#define FT_INTERNAL_EXTENSION_H FT2_INTERNAL_FILE( ftextend.h ) +#define FT_INTERNAL_DEBUG_H FT2_INTERNAL_FILE( ftdebug.h ) +#define FT_INTERNAL_CALC_H FT2_INTERNAL_FILE( ftcalc.h ) +#define FT_INTERNAL_DRIVER_H FT2_INTERNAL_FILE( ftdriver.h ) +#define FT_INTERNAL_EXTEND_H FT2_INTERNAL_FILE( ftextend.h ) -#define FT_INTERNAL_OBJECTS_H FT2_INTERNAL_FILE(ftobjs.h) -#define FT_INTERNAL_STREAM_H FT2_INTERNAL_FILE(ftstream.h) -#define FT_INTERNAL_MEMORY_H FT2_INTERNAL_FILE(ftmemory.h) -#define FT_INTERNAL_EXTENSION_H FT2_INTERNAL_FILE(ftextend.h) -#define FT_INTERNAL_DEBUG_H FT2_INTERNAL_FILE(ftdebug.h) -#define FT_INTERNAL_CALC_H FT2_INTERNAL_FILE(ftcalc.h) -#define FT_INTERNAL_DRIVER_H FT2_INTERNAL_FILE(ftdriver.h) -#define FT_INTERNAL_EXTEND_H FT2_INTERNAL_FILE(ftextend.h) +#define FT_INTERNAL_SFNT_H FT2_INTERNAL_FILE( sfnt.h ) -#define FT_INTERNAL_SFNT_H FT2_INTERNAL_FILE(sfnt.h) +#define FT_INTERNAL_TRUETYPE_TYPES_H FT2_INTERNAL_FILE( tttypes.h ) +#define FT_INTERNAL_TRUETYPE_ERRORS_H FT2_INTERNAL_FILE( tterrors.h ) -#define FT_INTERNAL_TRUETYPE_TYPES_H FT2_INTERNAL_FILE(tttypes.h) -#define FT_INTERNAL_TRUETYPE_ERRORS_H FT2_INTERNAL_FILE(tterrors.h) +#define FT_INTERNAL_TYPE1_ERRORS_H FT2_INTERNAL_FILE( t1errors.h ) +#define FT_INTERNAL_TYPE1_TYPES_H FT2_INTERNAL_FILE( t1types.h ) -#define FT_INTERNAL_TYPE1_ERRORS_H FT2_INTERNAL_FILE(t1errors.h) -#define FT_INTERNAL_TYPE1_TYPES_H FT2_INTERNAL_FILE(t1types.h) +#define FT_INTERNAL_CFF_ERRORS_H FT2_INTERNAL_FILE( t2errors.h ) +#define FT_INTERNAL_CFF_TYPES_H FT2_INTERNAL_FILE( t2types.h ) -#define FT_INTERNAL_CFF_ERRORS_H FT2_INTERNAL_FILE(t2errors.h) -#define FT_INTERNAL_CFF_TYPES_H FT2_INTERNAL_FILE(t2types.h) +#define FT_INTERNAL_POSTSCRIPT_NAMES_H FT2_INTERNAL_FILE( psnames.h ) +#define FT_INTERNAL_POSTSCRIPT_AUX_H FT2_INTERNAL_FILE( psaux.h ) -#define FT_INTERNAL_POSTSCRIPT_NAMES_H FT2_INTERNAL_FILE(psnames.h) -#define FT_INTERNAL_POSTSCRIPT_AUX_H FT2_INTERNAL_FILE(psaux.h) - -#define FT_INTERNAL_AUTOHINT_H FT2_INTERNAL_FILE(autohint.h) -#define FT_INTERNAL_FNT_TYPES_H FT2_INTERNAL_FILE(fnttypes.h) +#define FT_INTERNAL_AUTOHINT_H FT2_INTERNAL_FILE( autohint.h ) +#define FT_INTERNAL_FNT_TYPES_H FT2_INTERNAL_FILE( fnttypes.h ) /* END */ diff --git a/include/ft2build.h b/include/ft2build.h index 563b1b85..3da8add3 100644 --- a/include/ft2build.h +++ b/include/ft2build.h @@ -14,26 +14,20 @@ /* this file you indicate that you have read the license and */ /* understand and accept it fully. */ /* */ -/* */ -/* This file corresponds to the default "ft2build.h" file for */ -/* FreeType 2. It uses the "freetype" include root. */ -/* */ -/* Note that specific platforms might use a different configurations. */ -/* For example, on Unix, the "freetype2" include root is used, with */ -/* a specific "ft2build.h" used to take care of this. The latter */ -/* looks like the following: */ -/* */ -/* #ifndef __FT_BUILD_UNIX_H__ */ -/* #define __FT_BUILD_UNIX_H__ */ -/* */ -/* #define FT_ROOT freetype2 */ -/* #include <FT_ROOT/config/ft2build.h> */ -/* */ -/* #endif // __FT_BUILD_UNIX_H__ */ -/* */ /***************************************************************************/ + /*************************************************************************/ + /* */ + /* This file corresponds to the default "ft2build.h" file for */ + /* FreeType 2. It uses the "freetype" include root. */ + /* */ + /* Note that specific platforms might use a different configuration. */ + /* See builds/unix/ft2unix.h for an example. */ + /* */ + /*************************************************************************/ + + #ifndef __FT2_BUILD_GENERIC_H__ #define __FT2_BUILD_GENERIC_H__ @@ -41,4 +35,5 @@ #endif /* __FT2_BUILD_GENERIC_H__ */ + /* END */ diff --git a/src/autohint/ahangles.c b/src/autohint/ahangles.c index 71878523..f83f4d75 100644 --- a/src/autohint/ahangles.c +++ b/src/autohint/ahangles.c @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(autohint,ahangles.h) +#include FT_SOURCE_FILE( autohint, ahangles.h ) /* the following table has been automatically generated with */ diff --git a/src/autohint/ahangles.h b/src/autohint/ahangles.h index 30f9886d..c757d06c 100644 --- a/src/autohint/ahangles.h +++ b/src/autohint/ahangles.h @@ -26,7 +26,7 @@ #include <ft2build.h> #include FT_INTERNAL_OBJECTS_H -#include FT_SOURCE_FILE(autohint,ahtypes.h) +#include FT_SOURCE_FILE( autohint, ahtypes.h ) FT_BEGIN_HEADER diff --git a/src/autohint/ahglobal.c b/src/autohint/ahglobal.c index 63aab22c..97e36f17 100644 --- a/src/autohint/ahglobal.c +++ b/src/autohint/ahglobal.c @@ -20,8 +20,8 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(autohint,ahglobal.h) -#include FT_SOURCE_FILE(autohint,ahglyph.h) +#include FT_SOURCE_FILE( autohint, ahglobal.h ) +#include FT_SOURCE_FILE( autohint, ahglyph.h ) #define MAX_TEST_CHARACTERS 12 diff --git a/src/autohint/ahglobal.h b/src/autohint/ahglobal.h index f63462d9..3b3df6f7 100644 --- a/src/autohint/ahglobal.h +++ b/src/autohint/ahglobal.h @@ -25,7 +25,7 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(autohint,ahtypes.h) +#include FT_SOURCE_FILE( autohint, ahtypes.h ) #include FT_INTERNAL_OBJECTS_H diff --git a/src/autohint/ahglyph.c b/src/autohint/ahglyph.c index 9c6ebfda..6c61e1df 100644 --- a/src/autohint/ahglyph.c +++ b/src/autohint/ahglyph.c @@ -21,9 +21,9 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(autohint,ahglyph.h) -#include FT_SOURCE_FILE(autohint,ahangles.h) -#include FT_SOURCE_FILE(autohint,ahglobal.h) +#include FT_SOURCE_FILE( autohint, ahglyph.h ) +#include FT_SOURCE_FILE( autohint, ahangles.h ) +#include FT_SOURCE_FILE( autohint, ahglobal.h ) #include <stdio.h> diff --git a/src/autohint/ahglyph.h b/src/autohint/ahglyph.h index 4a19104d..cad38e43 100644 --- a/src/autohint/ahglyph.h +++ b/src/autohint/ahglyph.h @@ -25,7 +25,7 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(autohint,ahtypes.h) +#include FT_SOURCE_FILE( autohint, ahtypes.h ) FT_BEGIN_HEADER diff --git a/src/autohint/ahhint.c b/src/autohint/ahhint.c index 187b72c5..d563ad32 100644 --- a/src/autohint/ahhint.c +++ b/src/autohint/ahhint.c @@ -20,9 +20,9 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(autohint,ahhint.h) -#include FT_SOURCE_FILE(autohint,ahglyph.h) -#include FT_SOURCE_FILE(autohint,ahangles.h) +#include FT_SOURCE_FILE( autohint, ahhint.h ) +#include FT_SOURCE_FILE( autohint, ahglyph.h ) +#include FT_SOURCE_FILE( autohint, ahangles.h ) #include FT_OUTLINE_H diff --git a/src/autohint/ahhint.h b/src/autohint/ahhint.h index 777155ba..e8e5988f 100644 --- a/src/autohint/ahhint.h +++ b/src/autohint/ahhint.h @@ -24,7 +24,7 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(autohint,ahglobal.h) +#include FT_SOURCE_FILE( autohint, ahglobal.h ) FT_BEGIN_HEADER diff --git a/src/autohint/ahmodule.c b/src/autohint/ahmodule.c index f1a2564a..02f3e51a 100644 --- a/src/autohint/ahmodule.c +++ b/src/autohint/ahmodule.c @@ -21,7 +21,7 @@ #include <ft2build.h> #include FT_MODULE_H -#include FT_SOURCE_FILE(autohint,ahhint.h) +#include FT_SOURCE_FILE( autohint, ahhint.h ) typedef struct FT_AutoHinterRec_ diff --git a/src/autohint/ahoptim.c b/src/autohint/ahoptim.c index 910d635d..52a77346 100644 --- a/src/autohint/ahoptim.c +++ b/src/autohint/ahoptim.c @@ -33,7 +33,7 @@ #include <ft2build.h> #include FT_INTERNAL_OBJECTS_H /* for ALLOC_ARRAY() and FREE() */ -#include FT_SOURCE_FILE(autohint,ahoptim.h) +#include FT_SOURCE_FILE( autohint, ahoptim.h ) /* define this macro to use brute force optimisation -- this is slow, */ diff --git a/src/autohint/ahoptim.h b/src/autohint/ahoptim.h index b45366c4..9b3837cd 100644 --- a/src/autohint/ahoptim.h +++ b/src/autohint/ahoptim.h @@ -24,7 +24,7 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(autohint,ahtypes.h) +#include FT_SOURCE_FILE( autohint, ahtypes.h ) FT_BEGIN_HEADER diff --git a/src/autohint/ahtypes.h b/src/autohint/ahtypes.h index 8e47379d..9e68c7aa 100644 --- a/src/autohint/ahtypes.h +++ b/src/autohint/ahtypes.h @@ -26,7 +26,7 @@ #include <ft2build.h> #include FT_INTERNAL_OBJECTS_H -#include FT_SOURCE_FILE(autohint,ahloader.h) +#include FT_SOURCE_FILE( autohint, ahloader.h ) #define xxAH_DEBUG diff --git a/src/autohint/autohint.c b/src/autohint/autohint.c index a06eac53..80d04595 100644 --- a/src/autohint/autohint.c +++ b/src/autohint/autohint.c @@ -22,11 +22,11 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include <ft2build.h> -#include FT_SOURCE_FILE(autohint,ahangles.c) -#include FT_SOURCE_FILE(autohint,ahglyph.c) -#include FT_SOURCE_FILE(autohint,ahglobal.c) -#include FT_SOURCE_FILE(autohint,ahhint.c) -#include FT_SOURCE_FILE(autohint,ahmodule.c) +#include FT_SOURCE_FILE( autohint, ahangles.c ) +#include FT_SOURCE_FILE( autohint, ahglyph.c ) +#include FT_SOURCE_FILE( autohint, ahglobal.c ) +#include FT_SOURCE_FILE( autohint, ahhint.c ) +#include FT_SOURCE_FILE( autohint, ahmodule.c ) /* END */ diff --git a/src/base/ftbase.c b/src/base/ftbase.c index 39187008..695bbd39 100644 --- a/src/base/ftbase.c +++ b/src/base/ftbase.c @@ -17,13 +17,13 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(base,ftcalc.c) -#include FT_SOURCE_FILE(base,ftobjs.c) -#include FT_SOURCE_FILE(base,ftstream.c) -#include FT_SOURCE_FILE(base,ftlist.c) -#include FT_SOURCE_FILE(base,ftoutln.c) -#include FT_SOURCE_FILE(base,ftextend.c) -#include FT_SOURCE_FILE(base,ftnames.c) +#include FT_SOURCE_FILE( base, ftcalc.c ) +#include FT_SOURCE_FILE( base, ftobjs.c ) +#include FT_SOURCE_FILE( base, ftstream.c ) +#include FT_SOURCE_FILE( base, ftlist.c ) +#include FT_SOURCE_FILE( base, ftoutln.c ) +#include FT_SOURCE_FILE( base, ftextend.c ) +#include FT_SOURCE_FILE( base, ftnames.c ) /* END */ diff --git a/src/base/ftinit.c b/src/base/ftinit.c index f0d1e8d7..9a0d2164 100644 --- a/src/base/ftinit.c +++ b/src/base/ftinit.c @@ -60,7 +60,9 @@ #define FT_USE_MODULE( x ) extern const FT_Module_Class* x; #endif -#include <freetype/config/ftmodule.h> + +#include FT_CONFIG_MODULES_H + #undef FT_USE_MODULE #define FT_USE_MODULE( x ) (const FT_Module_Class*)&x, @@ -68,7 +70,7 @@ static const FT_Module_Class* const ft_default_modules[] = { -#include <freetype/config/ftmodule.h> +#include FT_CONFIG_MODULES_H 0 }; diff --git a/src/base/ftmac.c b/src/base/ftmac.c index 08681b31..8f7e7a0f 100644 --- a/src/base/ftmac.c +++ b/src/base/ftmac.c @@ -60,8 +60,8 @@ #include <ft2build.h> #include FT_FREETYPE_H #include FT_INTERNAL_STREAM_H -#include FT_SOURCE_FILE(truetype/ttobjs.h) -#include FT_SOURCE_FILE(type1/t1objs.h) +#include FT_SOURCE_FILE( truetype, ttobjs.h ) +#include FT_SOURCE_FILE( type1, t1objs.h ) #include <Resources.h> #include <Fonts.h> diff --git a/src/base/ftsystem.c b/src/base/ftsystem.c index 5b97e80c..3de93829 100644 --- a/src/base/ftsystem.c +++ b/src/base/ftsystem.c @@ -68,7 +68,7 @@ /* <Return> */ /* The address of newly allocated block. */ /* */ - static + FT_CALLBACK_DEF void* ft_alloc( FT_Memory memory, long size ) { @@ -98,7 +98,7 @@ /* <Return> */ /* The address of the reallocated memory block. */ /* */ - static + FT_CALLBACK_DEF void* ft_realloc( FT_Memory memory, long cur_size, long new_size, @@ -124,7 +124,7 @@ /* */ /* block :: The address of block in memory to be freed. */ /* */ - static + FT_CALLBACK_DEF void ft_free( FT_Memory memory, void* block ) { @@ -166,7 +166,7 @@ /* <Input> */ /* stream :: A pointer to the stream object. */ /* */ - static + FT_CALLBACK_DEF void ft_close_stream( FT_Stream stream ) { fclose( STREAM_FILE( stream ) ); @@ -197,7 +197,7 @@ /* <Return> */ /* The number of bytes actually read. */ /* */ - static + FT_CALLBACK_DEF unsigned long ft_io_stream( FT_Stream stream, unsigned long offset, unsigned char* buffer, diff --git a/src/cache/ftcache.c b/src/cache/ftcache.c index b9ebbb7e..37897608 100644 --- a/src/cache/ftcache.c +++ b/src/cache/ftcache.c @@ -19,12 +19,12 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include <ft2build.h> -#include FT_SOURCE_FILE(cache,ftlru.c) -#include FT_SOURCE_FILE(cache,ftcmanag.c) -#include FT_SOURCE_FILE(cache,ftcglyph.c) -#include FT_SOURCE_FILE(cache,ftcchunk.c) -#include FT_SOURCE_FILE(cache,ftcimage.c) -#include FT_SOURCE_FILE(cache,ftcsbits.c) +#include FT_SOURCE_FILE( cache, ftlru.c ) +#include FT_SOURCE_FILE( cache, ftcmanag.c ) +#include FT_SOURCE_FILE( cache, ftcglyph.c ) +#include FT_SOURCE_FILE( cache, ftcchunk.c ) +#include FT_SOURCE_FILE( cache, ftcimage.c ) +#include FT_SOURCE_FILE( cache, ftcsbits.c ) /* END */ diff --git a/src/cff/cff.c b/src/cff/cff.c index 5af56985..b2818c42 100644 --- a/src/cff/cff.c +++ b/src/cff/cff.c @@ -19,11 +19,11 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include <ft2build.h> -#include FT_SOURCE_FILE(cff,cffdrivr.c) -#include FT_SOURCE_FILE(cff,cffparse.c) -#include FT_SOURCE_FILE(cff,cffload.c) -#include FT_SOURCE_FILE(cff,cffobjs.c) -#include FT_SOURCE_FILE(cff,t2gload.c) +#include FT_SOURCE_FILE( cff, cffdrivr.c ) +#include FT_SOURCE_FILE( cff, cffparse.c ) +#include FT_SOURCE_FILE( cff, cffload.c ) +#include FT_SOURCE_FILE( cff, cffobjs.c ) +#include FT_SOURCE_FILE( cff, t2gload.c ) /* END */ diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c index f8853d65..9e3088c2 100644 --- a/src/cff/cffdrivr.c +++ b/src/cff/cffdrivr.c @@ -24,8 +24,8 @@ #include FT_TRUETYPE_NAMES_H #include FT_INTERNAL_CFF_ERRORS_H -#include FT_SOURCE_FILE(cff,cffdrivr.h) -#include FT_SOURCE_FILE(cff,t2gload.h) +#include FT_SOURCE_FILE( cff, cffdrivr.h ) +#include FT_SOURCE_FILE( cff, t2gload.h ) /*************************************************************************/ diff --git a/src/cff/cffload.c b/src/cff/cffload.c index db4d64aa..cef546e3 100644 --- a/src/cff/cffload.c +++ b/src/cff/cffload.c @@ -24,8 +24,8 @@ #include FT_INTERNAL_CFF_ERRORS_H #include FT_TRUETYPE_TAGS_H -#include FT_SOURCE_FILE(cff,cffload.h) -#include FT_SOURCE_FILE(cff,cffparse.h) +#include FT_SOURCE_FILE( cff, cffload.h ) +#include FT_SOURCE_FILE( cff, cffparse.h ) /*************************************************************************/ diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c index 321f417a..8541ac05 100644 --- a/src/cff/cffobjs.c +++ b/src/cff/cffobjs.c @@ -25,8 +25,8 @@ #include FT_TRUETYPE_TAGS_H #include FT_INTERNAL_SFNT_H #include FT_INTERNAL_POSTSCRIPT_NAMES_H -#include FT_SOURCE_FILE(cff,cffobjs.h) -#include FT_SOURCE_FILE(cff,cffload.h) +#include FT_SOURCE_FILE( cff, cffobjs.h ) +#include FT_SOURCE_FILE( cff, cffload.h ) #include FT_INTERNAL_CFF_ERRORS_H #include <string.h> /* for strlen() */ diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c index 06875c86..7a281062 100644 --- a/src/cff/cffparse.c +++ b/src/cff/cffparse.c @@ -17,7 +17,7 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(cff,cffparse.h) +#include FT_SOURCE_FILE( cff, cffparse.h ) #include FT_INTERNAL_CFF_ERRORS_H #include FT_INTERNAL_STREAM_H @@ -442,7 +442,7 @@ static const CFF_Field_Handler cff_field_handlers[] = { -#include FT_SOURCE_FILE(cff,cfftoken.h) +#include FT_SOURCE_FILE( cff, cfftoken.h ) { 0, 0, 0, 0, 0, 0, 0 } }; diff --git a/src/cff/t2gload.c b/src/cff/t2gload.c index 8cdff6cc..02395a27 100644 --- a/src/cff/t2gload.c +++ b/src/cff/t2gload.c @@ -24,8 +24,8 @@ #include FT_OUTLINE_H #include FT_TRUETYPE_TAGS_H -#include FT_SOURCE_FILE(cff,cffload.h) -#include FT_SOURCE_FILE(cff,t2gload.h) +#include FT_SOURCE_FILE( cff, cffload.h ) +#include FT_SOURCE_FILE( cff, t2gload.h ) #include FT_INTERNAL_CFF_ERRORS_H diff --git a/src/cff/t2gload.h b/src/cff/t2gload.h index 77f86625..f6ab7f10 100644 --- a/src/cff/t2gload.h +++ b/src/cff/t2gload.h @@ -22,7 +22,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include FT_SOURCE_FILE(cff,cffobjs.h) +#include FT_SOURCE_FILE( cff, cffobjs.h ) FT_BEGIN_HEADER diff --git a/src/cid/cidafm.c b/src/cid/cidafm.c index 6f4379fe..3f7c1a2a 100644 --- a/src/cid/cidafm.c +++ b/src/cid/cidafm.c @@ -17,7 +17,7 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(cid,cidafm.h) +#include FT_SOURCE_FILE( cid, cidafm.h ) #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_TYPE1_TYPES_H #include FT_INTERNAL_TYPE1_ERRORS_H diff --git a/src/cid/cidafm.h b/src/cid/cidafm.h index fe63b5f3..3cc13d7d 100644 --- a/src/cid/cidafm.h +++ b/src/cid/cidafm.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(cid,cidobjs.h) +#include FT_SOURCE_FILE( cid, cidobjs.h ) FT_BEGIN_HEADER diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c index 44ffa3b4..189cc4f2 100644 --- a/src/cid/cidgload.c +++ b/src/cid/cidgload.c @@ -17,8 +17,8 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(cid,cidload.h) -#include FT_SOURCE_FILE(cid,cidgload.h) +#include FT_SOURCE_FILE( cid, cidload.h ) +#include FT_SOURCE_FILE( cid, cidgload.h ) #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_STREAM_H #include FT_OUTLINE_H diff --git a/src/cid/cidgload.h b/src/cid/cidgload.h index a894d97f..e0a30c69 100644 --- a/src/cid/cidgload.h +++ b/src/cid/cidgload.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(cid,cidobjs.h) +#include FT_SOURCE_FILE( cid, cidobjs.h ) FT_BEGIN_HEADER diff --git a/src/cid/cidload.c b/src/cid/cidload.c index 77abcee1..b8e363a9 100644 --- a/src/cid/cidload.c +++ b/src/cid/cidload.c @@ -22,7 +22,7 @@ #include FT_MULTIPLE_MASTERS_H #include FT_INTERNAL_TYPE1_TYPES_H #include FT_INTERNAL_TYPE1_ERRORS_H -#include FT_SOURCE_FILE(cid,cidload.h) +#include FT_SOURCE_FILE( cid, cidload.h ) #include <stdio.h> #include <ctype.h> /* for isspace(), isalnum() */ diff --git a/src/cid/cidload.h b/src/cid/cidload.h index d5209049..841c43d9 100644 --- a/src/cid/cidload.h +++ b/src/cid/cidload.h @@ -22,7 +22,7 @@ #include <ft2build.h> #include FT_INTERNAL_STREAM_H -#include FT_SOURCE_FILE(cid,cidparse.h) +#include FT_SOURCE_FILE( cid, cidparse.h ) FT_BEGIN_HEADER diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c index 7dceb0e7..a3453777 100644 --- a/src/cid/cidobjs.c +++ b/src/cid/cidobjs.c @@ -19,8 +19,8 @@ #include <ft2build.h> #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_STREAM_H -#include FT_SOURCE_FILE(cid,cidgload.h) -#include FT_SOURCE_FILE(cid,cidload.h) +#include FT_SOURCE_FILE( cid, cidgload.h ) +#include FT_SOURCE_FILE( cid, cidload.h ) #include FT_INTERNAL_POSTSCRIPT_NAMES_H #include FT_INTERNAL_POSTSCRIPT_AUX_H diff --git a/src/cid/cidparse.c b/src/cid/cidparse.c index 31aeb870..ba495309 100644 --- a/src/cid/cidparse.c +++ b/src/cid/cidparse.c @@ -22,7 +22,7 @@ #include FT_INTERNAL_OBJECTS_H #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_TYPE1_ERRORS_H -#include FT_SOURCE_FILE(cid,cidparse.h) +#include FT_SOURCE_FILE( cid, cidparse.h ) #include <string.h> /* for strncmp() */ diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c index d916dab1..543d1428 100644 --- a/src/cid/cidriver.c +++ b/src/cid/cidriver.c @@ -17,8 +17,8 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(cid,cidriver.h) -#include FT_SOURCE_FILE(cid,cidgload.h) +#include FT_SOURCE_FILE( cid, cidriver.h ) +#include FT_SOURCE_FILE( cid, cidgload.h ) #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_POSTSCRIPT_NAMES_H diff --git a/src/cid/type1cid.c b/src/cid/type1cid.c index f27a4991..1b985843 100644 --- a/src/cid/type1cid.c +++ b/src/cid/type1cid.c @@ -19,11 +19,11 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include <ft2build.h> -#include FT_SOURCE_FILE(cid,cidparse.c) -#include FT_SOURCE_FILE(cid,cidload.c) -#include FT_SOURCE_FILE(cid,cidobjs.c) -#include FT_SOURCE_FILE(cid,cidriver.c) -#include FT_SOURCE_FILE(cid,cidgload.c) +#include FT_SOURCE_FILE( cid, cidparse.c ) +#include FT_SOURCE_FILE( cid, cidload.c ) +#include FT_SOURCE_FILE( cid, cidobjs.c ) +#include FT_SOURCE_FILE( cid, cidriver.c ) +#include FT_SOURCE_FILE( cid, cidgload.c ) /* END */ diff --git a/src/psaux/psaux.c b/src/psaux/psaux.c index c0119a80..d48661bd 100644 --- a/src/psaux/psaux.c +++ b/src/psaux/psaux.c @@ -19,9 +19,9 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include <ft2build.h> -#include FT_SOURCE_FILE(psaux,psobjs.c) -#include FT_SOURCE_FILE(psaux,psauxmod.c) -#include FT_SOURCE_FILE(psaux,t1decode.c) +#include FT_SOURCE_FILE( psaux, psobjs.c ) +#include FT_SOURCE_FILE( psaux, psauxmod.c ) +#include FT_SOURCE_FILE( psaux, t1decode.c ) /* END */ diff --git a/src/psaux/psauxmod.c b/src/psaux/psauxmod.c index d8f436c1..cb1dc6d7 100644 --- a/src/psaux/psauxmod.c +++ b/src/psaux/psauxmod.c @@ -17,9 +17,9 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(psaux,psauxmod.h) -#include FT_SOURCE_FILE(psaux,psobjs.h) -#include FT_SOURCE_FILE(psaux,t1decode.h) +#include FT_SOURCE_FILE( psaux, psauxmod.h ) +#include FT_SOURCE_FILE( psaux, psobjs.h ) +#include FT_SOURCE_FILE( psaux, t1decode.h ) FT_CALLBACK_TABLE_DEF diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c index 3f51e2b3..790ade91 100644 --- a/src/psaux/psobjs.c +++ b/src/psaux/psobjs.c @@ -20,7 +20,7 @@ #include FT_INTERNAL_POSTSCRIPT_AUX_H #include FT_INTERNAL_DEBUG_H #include FT_ERRORS_H -#include FT_SOURCE_FILE(psaux,psobjs.h) +#include FT_SOURCE_FILE( psaux, psobjs.h ) /*************************************************************************/ diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c index be53050d..20e41e5d 100644 --- a/src/psaux/t1decode.c +++ b/src/psaux/t1decode.c @@ -20,8 +20,8 @@ #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_TYPE1_ERRORS_H #include FT_OUTLINE_H -#include FT_SOURCE_FILE(psaux,t1decode.h) -#include FT_SOURCE_FILE(psaux,psobjs.h) +#include FT_SOURCE_FILE( psaux, t1decode.h ) +#include FT_SOURCE_FILE( psaux, psobjs.h ) /*************************************************************************/ diff --git a/src/psnames/psmodule.c b/src/psnames/psmodule.c index 1de46c63..42451aa1 100644 --- a/src/psnames/psmodule.c +++ b/src/psnames/psmodule.c @@ -19,8 +19,8 @@ #include <ft2build.h> #include FT_INTERNAL_POSTSCRIPT_NAMES_H #include FT_INTERNAL_OBJECTS_H -#include FT_SOURCE_FILE(psnames,psmodule.h) -#include FT_SOURCE_FILE(psnames,pstables.h) +#include FT_SOURCE_FILE( psnames, psmodule.h ) +#include FT_SOURCE_FILE( psnames, pstables.h ) #include <stdlib.h> /* for qsort() */ #include <string.h> /* for strcmp(), strncpy() */ diff --git a/src/psnames/psnames.c b/src/psnames/psnames.c index 07b5e155..9706500a 100644 --- a/src/psnames/psnames.c +++ b/src/psnames/psnames.c @@ -19,7 +19,7 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include <ft2build.h> -#include FT_SOURCE_FILE(psnames,psmodule.c) +#include FT_SOURCE_FILE( psnames, psmodule.c ) /* END */ diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c index 41b4d7f8..067ecd73 100644 --- a/src/raster/ftraster.c +++ b/src/raster/ftraster.c @@ -23,7 +23,7 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(raster,ftraster.h) +#include FT_SOURCE_FILE( raster, ftraster.h ) #include FT_INTERNAL_CALC_H /* for FT_MulDiv only */ diff --git a/src/raster/ftrend1.c b/src/raster/ftrend1.c index 81931f08..e1f9b57b 100644 --- a/src/raster/ftrend1.c +++ b/src/raster/ftrend1.c @@ -19,8 +19,8 @@ #include <ft2build.h> #include FT_INTERNAL_OBJECTS_H #include FT_OUTLINE_H -#include FT_SOURCE_FILE(raster,ftrend1.h) -#include FT_SOURCE_FILE(raster,ftraster.h) +#include FT_SOURCE_FILE( raster, ftrend1.h ) +#include FT_SOURCE_FILE( raster, ftraster.h ) /* initialize renderer -- init its raster */ diff --git a/src/raster/raster.c b/src/raster/raster.c index 96894a5b..4b984c51 100644 --- a/src/raster/raster.c +++ b/src/raster/raster.c @@ -19,8 +19,8 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include <ft2build.h> -#include FT_SOURCE_FILE(raster,ftraster.c) -#include FT_SOURCE_FILE(raster,ftrend1.c) +#include FT_SOURCE_FILE( raster, ftraster.c ) +#include FT_SOURCE_FILE( raster, ftrend1.c ) /* END */ diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c index 203115de..89c1d9cd 100644 --- a/src/sfnt/sfdriver.c +++ b/src/sfnt/sfdriver.c @@ -20,17 +20,17 @@ #include FT_INTERNAL_SFNT_H #include FT_INTERNAL_OBJECTS_H -#include FT_SOURCE_FILE(sfnt,sfdriver.h) -#include FT_SOURCE_FILE(sfnt,ttload.h) -#include FT_SOURCE_FILE(sfnt,ttcmap.h) -#include FT_SOURCE_FILE(sfnt,sfobjs.h) +#include FT_SOURCE_FILE( sfnt, sfdriver.h ) +#include FT_SOURCE_FILE( sfnt, ttload.h ) +#include FT_SOURCE_FILE( sfnt, ttcmap.h ) +#include FT_SOURCE_FILE( sfnt, sfobjs.h ) #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS -#include FT_SOURCE_FILE(sfnt,ttsbit.h) +#include FT_SOURCE_FILE( sfnt, ttsbit.h ) #endif #ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES -#include FT_SOURCE_FILE(sfnt,ttpost.h) +#include FT_SOURCE_FILE( sfnt, ttpost.h ) #endif #include <string.h> /* for strcmp() */ diff --git a/src/sfnt/sfnt.c b/src/sfnt/sfnt.c index d605ac83..e4bcf26d 100644 --- a/src/sfnt/sfnt.c +++ b/src/sfnt/sfnt.c @@ -19,17 +19,17 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include <ft2build.h> -#include FT_SOURCE_FILE(sfnt,ttload.c) -#include FT_SOURCE_FILE(sfnt,ttcmap.c) -#include FT_SOURCE_FILE(sfnt,sfobjs.c) -#include FT_SOURCE_FILE(sfnt,sfdriver.c) +#include FT_SOURCE_FILE( sfnt, ttload.c ) +#include FT_SOURCE_FILE( sfnt, ttcmap.c ) +#include FT_SOURCE_FILE( sfnt, sfobjs.c ) +#include FT_SOURCE_FILE( sfnt, sfdriver.c ) #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS -#include FT_SOURCE_FILE(sfnt,ttsbit.c) +#include FT_SOURCE_FILE( sfnt, ttsbit.c ) #endif #ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES -#include FT_SOURCE_FILE(sfnt,ttpost.c) +#include FT_SOURCE_FILE( sfnt, ttpost.c ) #endif diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c index e4284a4a..b836f499 100644 --- a/src/sfnt/sfobjs.c +++ b/src/sfnt/sfobjs.c @@ -17,8 +17,8 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(sfnt,sfobjs.h) -#include FT_SOURCE_FILE(sfnt,ttload.h) +#include FT_SOURCE_FILE( sfnt, sfobjs.h ) +#include FT_SOURCE_FILE( sfnt, ttload.h ) #include FT_INTERNAL_SFNT_H #include FT_INTERNAL_POSTSCRIPT_NAMES_H #include FT_TRUETYPE_NAMES_H diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c index 9698a80c..bda3f20d 100644 --- a/src/sfnt/ttcmap.c +++ b/src/sfnt/ttcmap.c @@ -19,8 +19,8 @@ #include <ft2build.h> #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_TRUETYPE_ERRORS_H -#include FT_SOURCE_FILE(sfnt,ttload.h) -#include FT_SOURCE_FILE(sfnt,ttcmap.h) +#include FT_SOURCE_FILE( sfnt, ttload.h ) +#include FT_SOURCE_FILE( sfnt, ttcmap.h ) /*************************************************************************/ diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c index 572d65bc..4e8e319c 100644 --- a/src/sfnt/ttload.c +++ b/src/sfnt/ttload.c @@ -22,8 +22,8 @@ #include FT_INTERNAL_TRUETYPE_ERRORS_H #include FT_INTERNAL_STREAM_H #include FT_TRUETYPE_TAGS_H -#include FT_SOURCE_FILE(sfnt,ttload.h) -#include FT_SOURCE_FILE(sfnt,ttcmap.h) +#include FT_SOURCE_FILE( sfnt, ttload.h ) +#include FT_SOURCE_FILE( sfnt, ttcmap.h ) /*************************************************************************/ diff --git a/src/sfnt/ttpost.c b/src/sfnt/ttpost.c index c2ee53ea..99685b52 100644 --- a/src/sfnt/ttpost.c +++ b/src/sfnt/ttpost.c @@ -29,8 +29,8 @@ #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_TRUETYPE_ERRORS_H #include FT_TRUETYPE_TAGS_H -#include FT_SOURCE_FILE(sfnt,ttpost.h) -#include FT_SOURCE_FILE(sfnt,ttload.h) +#include FT_SOURCE_FILE( sfnt, ttpost.h ) +#include FT_SOURCE_FILE( sfnt, ttload.h ) /*************************************************************************/ diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c index 2b637fc3..0053a692 100644 --- a/src/sfnt/ttsbit.c +++ b/src/sfnt/ttsbit.c @@ -21,7 +21,7 @@ #include FT_INTERNAL_TRUETYPE_ERRORS_H #include FT_INTERNAL_STREAM_H #include FT_TRUETYPE_TAGS_H -#include FT_SOURCE_FILE(sfnt,ttsbit.h) +#include FT_SOURCE_FILE( sfnt, ttsbit.h ) /*************************************************************************/ diff --git a/src/sfnt/ttsbit.h b/src/sfnt/ttsbit.h index bda3829c..c641c367 100644 --- a/src/sfnt/ttsbit.h +++ b/src/sfnt/ttsbit.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(sfnt,ttload.h) +#include FT_SOURCE_FILE( sfnt, ttload.h ) FT_BEGIN_HEADER diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c index ca863b7e..184975ab 100644 --- a/src/smooth/ftgrays.c +++ b/src/smooth/ftgrays.c @@ -123,7 +123,7 @@ #else /* _STANDALONE_ */ #include <ft2build.h> -#include FT_SOURCE_FILE(smooth,ftgrays.h) +#include FT_SOURCE_FILE( smooth, ftgrays.h ) #include FT_INTERNAL_OBJECTS_H #include FT_INTERNAL_DEBUG_H #include FT_OUTLINE_H diff --git a/src/smooth/ftsmooth.c b/src/smooth/ftsmooth.c index 9e568217..0a10ef17 100644 --- a/src/smooth/ftsmooth.c +++ b/src/smooth/ftsmooth.c @@ -19,8 +19,8 @@ #include <ft2build.h> #include FT_INTERNAL_OBJECTS_H #include FT_OUTLINE_H -#include FT_SOURCE_FILE(smooth,ftsmooth.h) -#include FT_SOURCE_FILE(smooth,ftgrays.h) +#include FT_SOURCE_FILE( smooth, ftsmooth.h ) +#include FT_SOURCE_FILE( smooth, ftgrays.h ) /* initialize renderer -- init its raster */ diff --git a/src/smooth/smooth.c b/src/smooth/smooth.c index aeeb254f..f7e87306 100644 --- a/src/smooth/smooth.c +++ b/src/smooth/smooth.c @@ -19,8 +19,8 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include <ft2build.h> -#include FT_SOURCE_FILE(smooth,ftgrays.c) -#include FT_SOURCE_FILE(smooth,ftsmooth.c) +#include FT_SOURCE_FILE( smooth, ftgrays.c ) +#include FT_SOURCE_FILE( smooth, ftsmooth.c ) /* END */ diff --git a/src/truetype/truetype.c b/src/truetype/truetype.c index a32c9b0e..55e9bc28 100644 --- a/src/truetype/truetype.c +++ b/src/truetype/truetype.c @@ -19,13 +19,13 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include <ft2build.h> -#include FT_SOURCE_FILE(truetype,ttdriver.c) /* driver interface */ -#include FT_SOURCE_FILE(truetype,ttpload.c) /* tables loader */ -#include FT_SOURCE_FILE(truetype,ttgload.c) /* glyph loader */ -#include FT_SOURCE_FILE(truetype,ttobjs.c) /* object manager */ +#include FT_SOURCE_FILE( truetype, ttdriver.c ) /* driver interface */ +#include FT_SOURCE_FILE( truetype, ttpload.c ) /* tables loader */ +#include FT_SOURCE_FILE( truetype, ttgload.c ) /* glyph loader */ +#include FT_SOURCE_FILE( truetype, ttobjs.c ) /* object manager */ #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER -#include FT_SOURCE_FILE(truetype,ttinterp.c) +#include FT_SOURCE_FILE( truetype, ttinterp.c ) #endif diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c index 44782325..4589c325 100644 --- a/src/truetype/ttdriver.c +++ b/src/truetype/ttdriver.c @@ -21,8 +21,8 @@ #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_SFNT_H #include FT_TRUETYPE_NAMES_H -#include FT_SOURCE_FILE(truetype,ttdriver.h) -#include FT_SOURCE_FILE(truetype,ttgload.h) +#include FT_SOURCE_FILE( truetype, ttdriver.h ) +#include FT_SOURCE_FILE( truetype, ttgload.h ) /*************************************************************************/ diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c index 8e560309..dec4aedb 100644 --- a/src/truetype/ttgload.c +++ b/src/truetype/ttgload.c @@ -24,7 +24,7 @@ #include FT_TRUETYPE_TAGS_H #include FT_OUTLINE_H -#include FT_SOURCE_FILE(truetype,ttgload.h) +#include FT_SOURCE_FILE( truetype, ttgload.h ) /*************************************************************************/ diff --git a/src/truetype/ttgload.h b/src/truetype/ttgload.h index 3bd41b67..b2d384ad 100644 --- a/src/truetype/ttgload.h +++ b/src/truetype/ttgload.h @@ -21,10 +21,10 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(truetype,ttobjs.h) +#include FT_SOURCE_FILE( truetype, ttobjs.h ) #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER -#include FT_SOURCE_FILE(truetype,ttinterp.h) +#include FT_SOURCE_FILE( truetype, ttinterp.h ) #endif diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index f60b55cc..9f40e754 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -20,7 +20,7 @@ #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_CALC_H #include FT_SYSTEM_H -#include FT_SOURCE_FILE(truetype,ttinterp.h) +#include FT_SOURCE_FILE( truetype, ttinterp.h ) #include FT_INTERNAL_TRUETYPE_ERRORS_H diff --git a/src/truetype/ttinterp.h b/src/truetype/ttinterp.h index b6f861c3..dbe5c41b 100644 --- a/src/truetype/ttinterp.h +++ b/src/truetype/ttinterp.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(truetype,ttobjs.h) +#include FT_SOURCE_FILE( truetype, ttobjs.h ) FT_BEGIN_HEADER diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c index d65524dc..55b888a7 100644 --- a/src/truetype/ttobjs.c +++ b/src/truetype/ttobjs.c @@ -26,11 +26,11 @@ #include FT_INTERNAL_POSTSCRIPT_NAMES_H #include FT_INTERNAL_TRUETYPE_ERRORS_H -#include FT_SOURCE_FILE(truetype,ttgload.h) -#include FT_SOURCE_FILE(truetype,ttpload.h) +#include FT_SOURCE_FILE( truetype, ttgload.h ) +#include FT_SOURCE_FILE( truetype, ttpload.h ) #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER -#include FT_SOURCE_FILE(truetype,ttinterp.h) +#include FT_SOURCE_FILE( truetype, ttinterp.h ) #endif diff --git a/src/truetype/ttpload.c b/src/truetype/ttpload.c index a14ad1f3..13fdccc7 100644 --- a/src/truetype/ttpload.c +++ b/src/truetype/ttpload.c @@ -21,7 +21,7 @@ #include FT_INTERNAL_OBJECTS_H #include FT_INTERNAL_STREAM_H #include FT_TRUETYPE_TAGS_H -#include FT_SOURCE_FILE(truetype,ttpload.h) +#include FT_SOURCE_FILE( truetype, ttpload.h ) #include FT_INTERNAL_TRUETYPE_ERRORS_H diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c index 970bc644..05cf4bf6 100644 --- a/src/type1/t1afm.c +++ b/src/type1/t1afm.c @@ -17,7 +17,7 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(type1,t1afm.h) +#include FT_SOURCE_FILE( type1, t1afm.h ) #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_TYPE1_TYPES_H #include <stdlib.h> /* for qsort() */ diff --git a/src/type1/t1afm.h b/src/type1/t1afm.h index 8426b10e..f64b7a2c 100644 --- a/src/type1/t1afm.h +++ b/src/type1/t1afm.h @@ -20,7 +20,7 @@ #define __T1AFM_H__ #include <ft2build.h> -#include FT_SOURCE_FILE(type1,t1objs.h) +#include FT_SOURCE_FILE( type1, t1objs.h ) FT_BEGIN_HEADER diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c index e933e885..b52e0f5b 100644 --- a/src/type1/t1driver.c +++ b/src/type1/t1driver.c @@ -17,12 +17,12 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(type1,t1driver.h) -#include FT_SOURCE_FILE(type1,t1gload.h) -#include FT_SOURCE_FILE(type1,t1load.h) +#include FT_SOURCE_FILE( type1, t1driver.h ) +#include FT_SOURCE_FILE( type1, t1gload.h ) +#include FT_SOURCE_FILE( type1, t1load.h ) #ifndef T1_CONFIG_OPTION_NO_AFM -#include FT_SOURCE_FILE(type1,t1afm.h) +#include FT_SOURCE_FILE( type1, t1afm.h ) #endif #include FT_INTERNAL_DEBUG_H diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c index 3d0891d4..23fcaf63 100644 --- a/src/type1/t1gload.c +++ b/src/type1/t1gload.c @@ -17,7 +17,7 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(type1,t1gload.h) +#include FT_SOURCE_FILE( type1, t1gload.h ) #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_STREAM_H #include FT_OUTLINE_H diff --git a/src/type1/t1gload.h b/src/type1/t1gload.h index 0c48eaf8..caf3765a 100644 --- a/src/type1/t1gload.h +++ b/src/type1/t1gload.h @@ -21,7 +21,7 @@ #include <ft2build.h> -#include FT_SOURCE_FILE(type1,t1objs.h) +#include FT_SOURCE_FILE( type1, t1objs.h ) FT_BEGIN_HEADER diff --git a/src/type1/t1load.c b/src/type1/t1load.c index f7133d43..a76f0668 100644 --- a/src/type1/t1load.c +++ b/src/type1/t1load.c @@ -68,7 +68,7 @@ #include FT_INTERNAL_TYPE1_TYPES_H #include FT_INTERNAL_TYPE1_ERRORS_H -#include FT_SOURCE_FILE(type1,t1load.h) +#include FT_SOURCE_FILE( type1, t1load.h ) #include <string.h> /* for strncmp(), strcmp() */ #include <ctype.h> /* for isalnum() */ @@ -1372,7 +1372,7 @@ const T1_Field t1_keywords[] = { -#include FT_SOURCE_FILE(type1,t1tokens.h) +#include FT_SOURCE_FILE( type1, t1tokens.h ) /* now add the special functions... */ T1_FIELD_CALLBACK( "FontName", parse_font_name ) diff --git a/src/type1/t1load.h b/src/type1/t1load.h index 40100d2a..0ab749ac 100644 --- a/src/type1/t1load.h +++ b/src/type1/t1load.h @@ -25,7 +25,7 @@ #include FT_INTERNAL_POSTSCRIPT_AUX_H #include FT_MULTIPLE_MASTERS_H -#include FT_SOURCE_FILE(type1,t1parse.h) +#include FT_SOURCE_FILE( type1, t1parse.h ) FT_BEGIN_HEADER diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c index 848e3e8a..30db0cae 100644 --- a/src/type1/t1objs.c +++ b/src/type1/t1objs.c @@ -22,11 +22,11 @@ #include <string.h> /* strcmp() */ -#include FT_SOURCE_FILE(type1,t1gload.h) -#include FT_SOURCE_FILE(type1,t1load.h) +#include FT_SOURCE_FILE( type1, t1gload.h ) +#include FT_SOURCE_FILE( type1, t1load.h ) #ifndef T1_CONFIG_OPTION_NO_AFM -#include FT_SOURCE_FILE(type1,t1afm.h) +#include FT_SOURCE_FILE( type1, t1afm.h ) #endif #include FT_INTERNAL_POSTSCRIPT_NAMES_H diff --git a/src/type1/t1parse.c b/src/type1/t1parse.c index 39d305c0..b22f467b 100644 --- a/src/type1/t1parse.c +++ b/src/type1/t1parse.c @@ -39,7 +39,7 @@ #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_TYPE1_ERRORS_H #include FT_INTERNAL_POSTSCRIPT_AUX_H -#include FT_SOURCE_FILE(type1,t1parse.h) +#include FT_SOURCE_FILE( type1, t1parse.h ) #include <string.h> /* for strncmp() */ diff --git a/src/type1/type1.c b/src/type1/type1.c index 03080f70..477e1614 100644 --- a/src/type1/type1.c +++ b/src/type1/type1.c @@ -19,14 +19,14 @@ #define FT_MAKE_OPTION_SINGLE_OBJECT #include <ft2build.h> -#include FT_SOURCE_FILE(type1,t1parse.c) -#include FT_SOURCE_FILE(type1,t1load.c) -#include FT_SOURCE_FILE(type1,t1objs.c) -#include FT_SOURCE_FILE(type1,t1driver.c) -#include FT_SOURCE_FILE(type1,t1gload.c) +#include FT_SOURCE_FILE( type1, t1parse.c ) +#include FT_SOURCE_FILE( type1, t1load.c ) +#include FT_SOURCE_FILE( type1, t1objs.c ) +#include FT_SOURCE_FILE( type1, t1driver.c ) +#include FT_SOURCE_FILE( type1, t1gload.c ) #ifndef T1_CONFIG_OPTION_NO_AFM -#include FT_SOURCE_FILE(type1,t1afm.c) +#include FT_SOURCE_FILE( type1, t1afm.c ) #endif diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c index 210c15a8..7c3b4c0e 100644 --- a/src/winfonts/winfnt.c +++ b/src/winfonts/winfnt.c @@ -22,7 +22,7 @@ #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_OBJECTS_H #include FT_INTERNAL_FNT_TYPES_H -#include FT_SOURCE_FILE(winfonts,winfnt.h) +#include FT_SOURCE_FILE( winfonts, winfnt.h ) /*************************************************************************/ |