* */*.h: Changed body inclusion macro names to start and end with

`__' (those which haven't converted yet).  Fixed minor conversion
issues.

* src/winfonts/winfnt.c: Updated to new header inclusion scheme.

* */*.[ch]: Changed source files to adhere to the new
* src/cff/cff.c, src/cff/rules.mk: Updated.

* */*.[ch]: Now using <ft2build.h> as the default build and setup
This commit is contained in:
Werner Lemberg 2000-12-09 00:45:38 +00:00
parent cc069beb2d
commit 90d9964ec9
100 changed files with 432 additions and 309 deletions

View File

@ -1,6 +1,14 @@
2000-12-08 Werner Lemberg <wl@gnu.org>
* */*.h: Changed body inclusion macro names to start and end with
`__' (those which haven't converted yet). Fixed minor conversion
issues.
* src/winfonts/winfnt.c: Updated to new header inclusion scheme.
2000-12-07 David Turner <david.turner@freetype.org> 2000-12-07 David Turner <david.turner@freetype.org>
* many files: Changed source files to adhere to the new * */*.[ch]: Changed source files to adhere to the new
header inclusion scheme. Not completely tested but works for now header inclusion scheme. Not completely tested but works for now
here. here.
@ -23,6 +31,8 @@
* src/cff/t2tokens.h: Renamed and updated to... * src/cff/t2tokens.h: Renamed and updated to...
* src/cff/cfftoken.h: New file. * src/cff/cfftoken.h: New file.
* src/cff/cff.c, src/cff/rules.mk: Updated.
2000-12-06 David Turner <david.turner@freetype.org> 2000-12-06 David Turner <david.turner@freetype.org>
* src/cache/ftlru.c (FT_Lru_Done): Fixed memory leak. * src/cache/ftlru.c (FT_Lru_Done): Fixed memory leak.
@ -58,7 +68,7 @@
is now installed as <ft2build.h> for Unix systems. Note that we is now installed as <ft2build.h> for Unix systems. Note that we
still use the "freetype2/freetype" installation path for now. still use the "freetype2/freetype" installation path for now.
* many files: Now using <ft2build.h> as the default build and setup * */*.[ch]: Now using <ft2build.h> as the default build and setup
configuration file in all public headers. Internal source files configuration file in all public headers. Internal source files
still need some changes though. still need some changes though.

View File

@ -45,10 +45,12 @@
#ifndef __FTCCHUNK_H__ #ifndef __FTCCHUNK_H__
#define __FTCCHUNK_H__ #define __FTCCHUNK_H__
#include <ft2build.h> #include <ft2build.h>
#include FT_CACHE_H #include FT_CACHE_H
#include FT_CACHE_MANAGER_H #include FT_CACHE_MANAGER_H
FT_BEGIN_HEADER FT_BEGIN_HEADER

View File

@ -53,10 +53,13 @@
#ifndef __FTCGLYPH_H__ #ifndef __FTCGLYPH_H__
#define __FTCGLYPH_H__ #define __FTCGLYPH_H__
#include <ft2build.h>
#include FT_CACHE_H #include <ft2build.h>
#include FT_CACHE_MANAGER_H #include FT_CACHE_H
#include <stddef.h> #include FT_CACHE_MANAGER_H
#include <stddef.h>
FT_BEGIN_HEADER FT_BEGIN_HEADER
@ -198,6 +201,7 @@ FT_BEGIN_HEADER
FT_UInt gindex, FT_UInt gindex,
FTC_GlyphNode *anode ); FTC_GlyphNode *anode );
FT_END_HEADER FT_END_HEADER
#endif /* __FTCGLYPH_H__ */ #endif /* __FTCGLYPH_H__ */

View File

@ -1,6 +1,6 @@
/***************************************************************************/ /***************************************************************************/
/* */ /* */
/* ftcimage.c */ /* ftcimage.h */
/* */ /* */
/* FreeType Image cache (body). */ /* FreeType Image cache (body). */
/* */ /* */
@ -26,9 +26,11 @@
#ifndef __FTCIMAGE_H__ #ifndef __FTCIMAGE_H__
#define __FTCIMAGE_H__ #define __FTCIMAGE_H__
#include <ft2build.h>
#include FT_CACHE_H #include <ft2build.h>
#include FT_CACHE_INTERNAL_GLYPH_H #include FT_CACHE_H
#include FT_CACHE_INTERNAL_GLYPH_H
FT_BEGIN_HEADER FT_BEGIN_HEADER

View File

@ -62,12 +62,15 @@
#ifndef __FTCMANAG_H__ #ifndef __FTCMANAG_H__
#define __FTCMANAG_H__ #define __FTCMANAG_H__
#include <ft2build.h>
#include FT_CACHE_H #include <ft2build.h>
#include FT_CACHE_INTERNAL_LRU_H #include FT_CACHE_H
#include FT_CACHE_INTERNAL_LRU_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
#define FTC_MAX_FACES_DEFAULT 2 #define FTC_MAX_FACES_DEFAULT 2
#define FTC_MAX_SIZES_DEFAULT 4 #define FTC_MAX_SIZES_DEFAULT 4
#define FTC_MAX_BYTES_DEFAULT 200000 /* 200kByte by default! */ #define FTC_MAX_BYTES_DEFAULT 200000 /* 200kByte by default! */
@ -359,6 +362,7 @@ FT_BEGIN_HEADER
/* */ /* */
FT_END_HEADER FT_END_HEADER
#endif /* __FTCMANAG_H__ */ #endif /* __FTCMANAG_H__ */

View File

@ -19,10 +19,13 @@
#ifndef __FTCSBITS_H__ #ifndef __FTCSBITS_H__
#define __FTCSBITS_H__ #define __FTCSBITS_H__
#include <ft2build.h>
#include FT_CACHE_H #include <ft2build.h>
#include FT_CACHE_INTERNAL_CHUNK_H #include FT_CACHE_H
#include FT_CACHE_IMAGE_H #include FT_CACHE_INTERNAL_CHUNK_H
#include FT_CACHE_IMAGE_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
@ -57,6 +60,7 @@ FT_BEGIN_HEADER
FTC_Image_Desc* desc, FTC_Image_Desc* desc,
FT_UInt gindex, FT_UInt gindex,
FTC_SBit *sbit ); FTC_SBit *sbit );
FT_END_HEADER FT_END_HEADER
#endif /* __FTCSBITS_H__ */ #endif /* __FTCSBITS_H__ */

View File

@ -58,8 +58,10 @@
#ifndef __FTLRU_H__ #ifndef __FTLRU_H__
#define __FTLRU_H__ #define __FTLRU_H__
#include <ft2build.h>
#include FT_FREETYPE_H #include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
@ -162,6 +164,7 @@ FT_BEGIN_HEADER
FT_Lru_Selector selector, FT_Lru_Selector selector,
FT_Pointer data ); FT_Pointer data );
FT_END_HEADER FT_END_HEADER
#endif /* __FTLRU_H__ */ #endif /* __FTLRU_H__ */

View File

@ -13,28 +13,30 @@
/* this file you indicate that you have read the license and */ /* this file you indicate that you have read the license and */
/* understand and accept it fully. */ /* 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 FT2_ROOT freetype2 */
/* #include <FT2_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 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 FT2_ROOT freetype2 */
/* #include <FT2_ROOT/config/ft2build.h> */
/* */
/* #endif // __FT_BUILD_UNIX_H__ */
/* */
/*************************************************************************/
#ifndef __FT2_BUILD_H__ #ifndef __FT2_BUILD_H__
#define __FT2_BUILD_H__ #define __FT2_BUILD_H__

View File

@ -39,11 +39,13 @@
#ifndef __FTCONFIG_H__ #ifndef __FTCONFIG_H__
#define __FTCONFIG_H__ #define __FTCONFIG_H__
#include <ft2build.h> #include <ft2build.h>
#include FT_CONFIG_OPTIONS_H #include FT_CONFIG_OPTIONS_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* PLATFORM-SPECIFIC CONFIGURATION MACROS */ /* PLATFORM-SPECIFIC CONFIGURATION MACROS */

View File

@ -16,13 +16,14 @@
/***************************************************************************/ /***************************************************************************/
#ifndef FTOPTION_H #ifndef __FTOPTION_H__
#define FTOPTION_H #define __FTOPTION_H__
#ifdef __cplusplus #include <ft2build.h>
extern "C" {
#endif
FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
@ -389,12 +390,10 @@
#undef T1_CONFIG_OPTION_NO_MM_SUPPORT #undef T1_CONFIG_OPTION_NO_MM_SUPPORT
#ifdef __cplusplus FT_END_HEADER
}
#endif
#endif /* FTOPTION_H */ #endif /* __FTOPTION_H__ */
/* END */ /* END */

View File

@ -19,6 +19,7 @@
#ifndef __FREETYPE_H__ #ifndef __FREETYPE_H__
#define __FREETYPE_H__ #define __FREETYPE_H__
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* The `raster' component duplicates some of the declarations in */ /* The `raster' component duplicates some of the declarations in */
@ -42,8 +43,10 @@
#include FT_ERRORS_H #include FT_ERRORS_H
#include FT_TYPES_H #include FT_TYPES_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
/*************************************************************************/ /*************************************************************************/
/* */ /* */
@ -2283,6 +2286,7 @@ FT_BEGIN_HEADER
/* */ /* */
FT_END_HEADER FT_END_HEADER
#endif /* __FREETYPE_H__ */ #endif /* __FREETYPE_H__ */

View File

@ -30,11 +30,14 @@
#ifndef FTBBOX_H #ifndef FTBBOX_H
#define FTBBOX_H #define FTBBOX_H
#include <ft2build.h>
#include FT_FREETYPE_H #include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* <Function> */ /* <Function> */
@ -62,6 +65,7 @@ FT_BEGIN_HEADER
/* */ /* */
FT_END_HEADER FT_END_HEADER
#endif /* FTBBOX_H */ #endif /* FTBBOX_H */

View File

@ -34,11 +34,14 @@
#ifndef __FTCACHE_H__ #ifndef __FTCACHE_H__
#define __FTCACHE_H__ #define __FTCACHE_H__
#include <ft2build.h>
#include FT_GLYPH_H #include <ft2build.h>
#include FT_GLYPH_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
#define FT_CACHE_MANAGER_H FT2_PUBLIC_FILE(cache/ftcmanag.h) #define FT_CACHE_MANAGER_H FT2_PUBLIC_FILE(cache/ftcmanag.h)
#define FT_CACHE_IMAGE_H FT2_PUBLIC_FILE(cache/ftcimage.h) #define FT_CACHE_IMAGE_H FT2_PUBLIC_FILE(cache/ftcimage.h)
#define FT_CACHE_SMALL_BITMAPS_H FT2_PUBLIC_FILE(cache/ftcsbits.h) #define FT_CACHE_SMALL_BITMAPS_H FT2_PUBLIC_FILE(cache/ftcsbits.h)

View File

@ -23,7 +23,7 @@
/* something like */ /* something like */
/* */ /* */
/* { */ /* { */
/* #undef FTERRORS_H */ /* #undef __FTERRORS_H__ */
/* #define FT_ERRORDEF( e, v, s ) { e, s }, */ /* #define FT_ERRORDEF( e, v, s ) { e, s }, */
/* #define FT_ERROR_START_LIST { */ /* #define FT_ERROR_START_LIST { */
/* #define FT_ERROR_END_LIST { 0, 0 } }; */ /* #define FT_ERROR_END_LIST { 0, 0 } }; */
@ -34,7 +34,7 @@
/* const char* err_msg */ /* const char* err_msg */
/* } ft_errors[] = */ /* } ft_errors[] = */
/* */ /* */
/* #include <freetype/fterrors.h> */ /* #include FT_ERRORS_H */
/* } */ /* } */
/* */ /* */
/* For C++ it might be necessary to use `extern "C" {' and to define */ /* For C++ it might be necessary to use `extern "C" {' and to define */

View File

@ -32,8 +32,10 @@
#ifndef __FTGLYPH_H__ #ifndef __FTGLYPH_H__
#define __FTGLYPH_H__ #define __FTGLYPH_H__
#include <ft2build.h>
#include FT_FREETYPE_H #include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER FT_BEGIN_HEADER

View File

@ -30,6 +30,7 @@
#include <ft2build.h> #include <ft2build.h>
FT_BEGIN_HEADER FT_BEGIN_HEADER
@ -994,7 +995,6 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* __FTIMAGE_H__ */ #endif /* __FTIMAGE_H__ */

View File

@ -1,6 +1,6 @@
/***************************************************************************/ /***************************************************************************/
/* */ /* */
/* ftlist.c */ /* ftlist.h */
/* */ /* */
/* Generic list support for FreeType (specification). */ /* Generic list support for FreeType (specification). */
/* */ /* */
@ -27,8 +27,10 @@
#ifndef __FTLIST_H__ #ifndef __FTLIST_H__
#define __FTLIST_H__ #define __FTLIST_H__
#include <ft2build.h>
#include FT_FREETYPE_H #include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
@ -216,4 +218,5 @@ FT_END_HEADER
#endif /* __FTLIST_H__ */ #endif /* __FTLIST_H__ */
/* END */ /* END */

View File

@ -29,9 +29,10 @@
#define __FT_MAC_H__ #define __FT_MAC_H__
#ifdef __cplusplus #include <ft2build.h>
extern "C" {
#endif
FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
@ -70,9 +71,7 @@
FT_Face *aface ); FT_Face *aface );
#ifdef __cplusplus FT_END_HEADER
}
#endif
#endif /* __FT_MAC_H__ */ #endif /* __FT_MAC_H__ */

View File

@ -19,11 +19,14 @@
#ifndef __FTMM_H__ #ifndef __FTMM_H__
#define __FTMM_H__ #define __FTMM_H__
#include <ft2build.h>
#include FT_TYPE1_TABLES_H #include <ft2build.h>
#include FT_TYPE1_TABLES_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* <Struct> */ /* <Struct> */

View File

@ -19,11 +19,14 @@
#ifndef __FTMODULE_H__ #ifndef __FTMODULE_H__
#define __FTMODULE_H__ #define __FTMODULE_H__
#include <ft2build.h>
#include FT_FREETYPE_H #include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
/* module bit flags */ /* module bit flags */
typedef enum FT_Module_Flags_ typedef enum FT_Module_Flags_
{ {

View File

@ -22,8 +22,10 @@
#ifndef __FTNAMES_H__ #ifndef __FTNAMES_H__
#define __FTNAMES_H__ #define __FTNAMES_H__
#include <ft2build.h>
#include FT_FREETYPE_H #include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER FT_BEGIN_HEADER

View File

@ -20,8 +20,10 @@
#ifndef __FTOUTLN_H__ #ifndef __FTOUTLN_H__
#define __FTOUTLN_H__ #define __FTOUTLN_H__
#include <ft2build.h>
#include FT_FREETYPE_H #include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
@ -313,6 +315,7 @@ FT_BEGIN_HEADER
FT_Outline* outline, FT_Outline* outline,
FT_Raster_Params* params ); FT_Raster_Params* params );
FT_END_HEADER FT_END_HEADER
#endif /* __FTOUTLN_H__ */ #endif /* __FTOUTLN_H__ */

View File

@ -19,9 +19,11 @@
#ifndef __FTRENDER_H__ #ifndef __FTRENDER_H__
#define __FTRENDER_H__ #define __FTRENDER_H__
#include <ft2build.h>
#include FT_MODULE_H #include <ft2build.h>
#include FT_GLYPH_H #include FT_MODULE_H
#include FT_GLYPH_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
@ -180,6 +182,7 @@ FT_BEGIN_HEADER
/* */ /* */
FT_END_HEADER FT_END_HEADER
#endif /* __FTRENDER_H__ */ #endif /* __FTRENDER_H__ */

View File

@ -37,11 +37,14 @@
#ifndef __FTSYNTH_H__ #ifndef __FTSYNTH_H__
#define __FTSYNTH_H__ #define __FTSYNTH_H__
#include <ft2build.h>
#include FT_FREETYPE_H #include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
/* This code is completely experimental -- use with care! */ /* This code is completely experimental -- use with care! */
/* It will probably be completely rewritten in the future */ /* It will probably be completely rewritten in the future */
/* or even integrated into the library. */ /* or even integrated into the library. */
@ -53,8 +56,8 @@ FT_BEGIN_HEADER
FT_Outline* outline, FT_Outline* outline,
FT_Pos* advance ); FT_Pos* advance );
FT_END_HEADER
FT_END_HEADER
#endif /* __FTSYNTH_H__ */ #endif /* __FTSYNTH_H__ */

View File

@ -16,13 +16,14 @@
/***************************************************************************/ /***************************************************************************/
#ifndef FTSYSTEM_H #ifndef __FTSYSTEM_H__
#define FTSYSTEM_H #define __FTSYSTEM_H__
#ifdef __cplusplus #include <ft2build.h>
extern "C" {
#endif
FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
@ -100,12 +101,9 @@
}; };
#ifdef __cplusplus FT_END_HEADER
}
#endif
#endif /* __FTSYSTEM_H__ */
#endif /* FTSYSTEM_H */
/* END */ /* END */

View File

@ -19,13 +19,16 @@
#ifndef __FTTYPES_H__ #ifndef __FTTYPES_H__
#define __FTTYPES_H__ #define __FTTYPES_H__
#include <ft2build.h>
#include FT_SYSTEM_H #include <ft2build.h>
#include FT_IMAGE_H #include FT_SYSTEM_H
#include <stddef.h> #include FT_IMAGE_H
#include <stddef.h>
FT_BEGIN_HEADER FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* <Type> */ /* <Type> */
@ -396,6 +399,7 @@ FT_BEGIN_HEADER
#define FT_IS_EMPTY( list ) ( (list).head == 0 ) #define FT_IS_EMPTY( list ) ( (list).head == 0 )
FT_END_HEADER FT_END_HEADER
#endif /* __FTTYPES_H__ */ #endif /* __FTTYPES_H__ */

View File

@ -69,11 +69,14 @@
/* */ /* */
/*************************************************************************/ /*************************************************************************/
#include <ft2build.h>
#include FT_FREETYPE_H #include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
typedef struct FT_AutoHinterRec_ *FT_AutoHinter; typedef struct FT_AutoHinterRec_ *FT_AutoHinter;

View File

@ -20,8 +20,10 @@
#ifndef __FNTTYPES_H__ #ifndef __FNTTYPES_H__
#define __FNTTYPES_H__ #define __FNTTYPES_H__
#include <ft2build.h>
#include FT_FREETYPE_H #include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER FT_BEGIN_HEADER

View File

@ -19,8 +19,10 @@
#ifndef __FTCALC_H__ #ifndef __FTCALC_H__
#define __FTCALC_H__ #define __FTCALC_H__
#include <ft2build.h>
#include FT_FREETYPE_H #include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
@ -214,6 +216,7 @@ FT_BEGIN_HEADER
#define ROUND_F26DOT6( x ) ( x >= 0 ? ( ( (x) + 32 ) & -64 ) \ #define ROUND_F26DOT6( x ) ( x >= 0 ? ( ( (x) + 32 ) & -64 ) \
: ( -( ( 32 - (x) ) & -64 ) ) ) : ( -( ( 32 - (x) ) & -64 ) ) )
FT_END_HEADER FT_END_HEADER
#endif /* __FTCALC_H__ */ #endif /* __FTCALC_H__ */

View File

@ -19,11 +19,14 @@
#ifndef __FTDEBUG_H__ #ifndef __FTDEBUG_H__
#define __FTDEBUG_H__ #define __FTDEBUG_H__
#include <ft2build.h>
#include FT_CONFIG_CONFIG_H #include <ft2build.h>
#include FT_CONFIG_CONFIG_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
#ifdef FT_DEBUG_LEVEL_TRACE #ifdef FT_DEBUG_LEVEL_TRACE

View File

@ -19,8 +19,10 @@
#ifndef __FTDRIVER_H__ #ifndef __FTDRIVER_H__
#define __FTDRIVER_H__ #define __FTDRIVER_H__
#include <ft2build.h>
#include FT_MODULE_H #include <ft2build.h>
#include FT_MODULE_H
FT_BEGIN_HEADER FT_BEGIN_HEADER

View File

@ -19,11 +19,14 @@
#ifndef __FTEXTEND_H__ #ifndef __FTEXTEND_H__
#define __FTEXTEND_H__ #define __FTEXTEND_H__
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H #include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* The extensions don't need to be integrated at compile time into the */ /* The extensions don't need to be integrated at compile time into the */

View File

@ -19,12 +19,15 @@
#ifndef __FTMEMORY_H__ #ifndef __FTMEMORY_H__
#define __FTMEMORY_H__ #define __FTMEMORY_H__
#include <ft2build.h>
#include FT_CONFIG_CONFIG_H #include <ft2build.h>
#include FT_TYPES_H #include FT_CONFIG_CONFIG_H
#include FT_TYPES_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* <Macro> */ /* <Macro> */

View File

@ -26,14 +26,17 @@
#ifndef __FTOBJS_H__ #ifndef __FTOBJS_H__
#define __FTOBJS_H__ #define __FTOBJS_H__
#include <ft2build.h> #include <ft2build.h>
#include FT_RENDER_H #include FT_RENDER_H
#include FT_INTERNAL_MEMORY_H #include FT_INTERNAL_MEMORY_H
#include FT_INTERNAL_DRIVER_H #include FT_INTERNAL_DRIVER_H
#include FT_INTERNAL_AUTOHINT_H #include FT_INTERNAL_AUTOHINT_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* Some generic definitions. */ /* Some generic definitions. */

View File

@ -19,8 +19,10 @@
#ifndef __FTSTREAM_H__ #ifndef __FTSTREAM_H__
#define __FTSTREAM_H__ #define __FTSTREAM_H__
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H #include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H
FT_BEGIN_HEADER FT_BEGIN_HEADER

View File

@ -24,7 +24,7 @@
/*************************************************************************/ /*************************************************************************/
/* don't add spaces around the argument of FT_INTERNAL_FILE! */ /* don't add spaces around the argument of FT2_INTERNAL_FILE! */
#define FT_INTERNAL_OBJECTS_H FT2_INTERNAL_FILE(ftobjs.h) #define FT_INTERNAL_OBJECTS_H FT2_INTERNAL_FILE(ftobjs.h)
#define FT_INTERNAL_STREAM_H FT2_INTERNAL_FILE(ftstream.h) #define FT_INTERNAL_STREAM_H FT2_INTERNAL_FILE(ftstream.h)

View File

@ -20,9 +20,11 @@
#ifndef __PSAUX_H__ #ifndef __PSAUX_H__
#define __PSAUX_H__ #define __PSAUX_H__
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H #include <ft2build.h>
#include FT_INTERNAL_TYPE1_TYPES_H #include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_TYPE1_TYPES_H
FT_BEGIN_HEADER FT_BEGIN_HEADER

View File

@ -20,11 +20,14 @@
#ifndef __PSNAMES_H__ #ifndef __PSNAMES_H__
#define __PSNAMES_H__ #define __PSNAMES_H__
#include <ft2build.h>
#include FT_FREETYPE_H #include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* <FuncType> */ /* <FuncType> */

View File

@ -19,12 +19,15 @@
#ifndef __SFNT_H__ #ifndef __SFNT_H__
#define __SFNT_H__ #define __SFNT_H__
#include <ft2build.h>
#include FT_INTERNAL_DRIVER_H #include <ft2build.h>
#include FT_INTERNAL_TRUETYPE_TYPES_H #include FT_INTERNAL_DRIVER_H
#include FT_INTERNAL_TRUETYPE_TYPES_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* <FuncType> */ /* <FuncType> */

View File

@ -20,9 +20,10 @@
#define __T1ERRORS_H__ #define __T1ERRORS_H__
#ifdef __cplusplus #include <ft2build.h>
extern "C" {
#endif
FT_BEGIN_HEADER
/************************ error codes declaration **************/ /************************ error codes declaration **************/
@ -66,10 +67,7 @@
#define T1_Err_Stack_Overflow FT_Err_Invalid_File_Format #define T1_Err_Stack_Overflow FT_Err_Invalid_File_Format
#ifdef __cplusplus FT_END_HEADER
}
#endif
#endif /* __T1ERRORS_H__ */ #endif /* __T1ERRORS_H__ */

View File

@ -20,9 +20,11 @@
#ifndef __T1TYPES_H__ #ifndef __T1TYPES_H__
#define __T1TYPES_H__ #define __T1TYPES_H__
#include <ft2build.h>
#include FT_TYPE1_TABLES_H #include<ft2build.h>
#include FT_INTERNAL_POSTSCRIPT_NAMES_H #include FT_TYPE1_TABLES_H
#include FT_INTERNAL_POSTSCRIPT_NAMES_H
FT_BEGIN_HEADER FT_BEGIN_HEADER

View File

@ -20,9 +20,10 @@
#define __T2ERRORS_H__ #define __T2ERRORS_H__
#ifdef __cplusplus #include <ft2build.h>
extern "C" {
#endif
FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
@ -120,9 +121,7 @@
#define T2_Err_Could_Not_Find_Context 0x550 #define T2_Err_Could_Not_Find_Context 0x550
#ifdef __cplusplus FT_END_HEADER
}
#endif
#endif /* __T2ERRORS_H__ */ #endif /* __T2ERRORS_H__ */

View File

@ -20,8 +20,10 @@
#ifndef __T2TYPES_H__ #ifndef __T2TYPES_H__
#define __T2TYPES_H__ #define __T2TYPES_H__
#include <ft2build.h>
#include FT_FREETYPE_H #include <ft2build.h>
#include FT_FREETYPE_H
FT_BEGIN_HEADER FT_BEGIN_HEADER

View File

@ -20,9 +20,10 @@
#define __TTERRORS_H__ #define __TTERRORS_H__
#ifdef __cplusplus #include <ft2build.h>
extern "C" {
#endif
FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
@ -120,9 +121,7 @@
#define TT_Err_Could_Not_Find_Context 0x450 #define TT_Err_Could_Not_Find_Context 0x450
#ifdef __cplusplus FT_END_HEADER
}
#endif
#endif /* __TTERRORS_H__ */ #endif /* __TTERRORS_H__ */

View File

@ -20,9 +20,11 @@
#ifndef __TTTYPES_H__ #ifndef __TTTYPES_H__
#define __TTTYPES_H__ #define __TTTYPES_H__
#include <ft2build.h>
#include FT_TRUETYPE_TABLES_H #include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H #include FT_TRUETYPE_TABLES_H
#include FT_INTERNAL_OBJECTS_H
FT_BEGIN_HEADER FT_BEGIN_HEADER

View File

@ -20,11 +20,14 @@
#ifndef __T1TABLES_H__ #ifndef __T1TABLES_H__
#define __T1TABLES_H__ #define __T1TABLES_H__
#include <ft2build.h> #include <ft2build.h>
#include FT_FREETYPE_H #include FT_FREETYPE_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
/* Note that we separate font data in T1_FontInfo and T1_Private */ /* Note that we separate font data in T1_FontInfo and T1_Private */
/* structures in order to support Multiple Master fonts. */ /* structures in order to support Multiple Master fonts. */

View File

@ -20,9 +20,10 @@
#define __TTNAMEID_H__ #define __TTNAMEID_H__
#ifdef __cplusplus #include <ft2build.h>
extern "C" {
#endif
FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
@ -713,10 +714,7 @@
#endif /* !HAVE_LIMIT_ON_IDENTS */ #endif /* !HAVE_LIMIT_ON_IDENTS */
#ifdef __cplusplus FT_END_HEADER
}
#endif
#endif /* __TTNAMEID_H__ */ #endif /* __TTNAMEID_H__ */

View File

@ -20,11 +20,14 @@
#ifndef __TTTABLES_H__ #ifndef __TTTABLES_H__
#define __TTTABLES_H__ #define __TTTABLES_H__
#include <ft2build.h> #include <ft2build.h>
#include FT_FREETYPE_H #include FT_FREETYPE_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* <Struct> */ /* <Struct> */

View File

@ -19,11 +19,14 @@
#ifndef __TTAGS_H__ #ifndef __TTAGS_H__
#define __TTAGS_H__ #define __TTAGS_H__
#include <ft2build.h> #include <ft2build.h>
#include FT_FREETYPE_H #include FT_FREETYPE_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
#define TTAG_cmap FT_MAKE_TAG( 'c', 'm', 'a', 'p' ) #define TTAG_cmap FT_MAKE_TAG( 'c', 'm', 'a', 'p' )
#define TTAG_cvt FT_MAKE_TAG( 'c', 'v', 't', ' ' ) #define TTAG_cvt FT_MAKE_TAG( 'c', 'v', 't', ' ' )
#define TTAG_CFF FT_MAKE_TAG( 'C', 'F', 'F', ' ' ) #define TTAG_CFF FT_MAKE_TAG( 'C', 'F', 'F', ' ' )
@ -62,6 +65,7 @@ FT_BEGIN_HEADER
#define TTAG_vhea FT_MAKE_TAG( 'v', 'h', 'e', 'a' ) #define TTAG_vhea FT_MAKE_TAG( 'v', 'h', 'e', 'a' )
#define TTAG_vmtx FT_MAKE_TAG( 'v', 'm', 't', 'x' ) #define TTAG_vmtx FT_MAKE_TAG( 'v', 'm', 't', 'x' )
FT_END_HEADER FT_END_HEADER
#endif /* __TTAGS_H__ */ #endif /* __TTAGS_H__ */

View File

@ -19,6 +19,7 @@
/* */ /* */
/***************************************************************************/ /***************************************************************************/
#include <ft2build.h> #include <ft2build.h>
#include FT_SOURCE_FILE(autohint,ahangles.h) #include FT_SOURCE_FILE(autohint,ahangles.h)

View File

@ -23,12 +23,15 @@
#ifndef __AHANGLES_H__ #ifndef __AHANGLES_H__
#define __AHANGLES_H__ #define __AHANGLES_H__
#include <ft2build.h> #include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H #include FT_INTERNAL_OBJECTS_H
#include FT_SOURCE_FILE(autohint,ahtypes.h) #include FT_SOURCE_FILE(autohint,ahtypes.h)
FT_BEGIN_HEADER FT_BEGIN_HEADER
/* PI expressed in ah_angles -- we don't really need an important */ /* PI expressed in ah_angles -- we don't really need an important */
/* precision, so 256 should be enough */ /* precision, so 256 should be enough */
#define AH_PI 256 #define AH_PI 256

View File

@ -18,6 +18,7 @@
/* */ /* */
/***************************************************************************/ /***************************************************************************/
#include <ft2build.h> #include <ft2build.h>
#include FT_SOURCE_FILE(autohint,ahglobal.h) #include FT_SOURCE_FILE(autohint,ahglobal.h)
#include FT_SOURCE_FILE(autohint,ahglyph.h) #include FT_SOURCE_FILE(autohint,ahglyph.h)

View File

@ -23,10 +23,12 @@
#ifndef __AHGLOBAL_H__ #ifndef __AHGLOBAL_H__
#define __AHGLOBAL_H__ #define __AHGLOBAL_H__
#include <ft2build.h> #include <ft2build.h>
#include FT_SOURCE_FILE(autohint,ahtypes.h) #include FT_SOURCE_FILE(autohint,ahtypes.h)
#include FT_INTERNAL_OBJECTS_H #include FT_INTERNAL_OBJECTS_H
FT_BEGIN_HEADER FT_BEGIN_HEADER

View File

@ -20,8 +20,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef AHGLYPH_H #ifndef __AHGLYPH_H__
#define AHGLYPH_H #define __AHGLYPH_H__
#include <ft2build.h> #include <ft2build.h>
@ -86,7 +86,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* AHGLYPH_H */ #endif /* __AHGLYPH_H__ */
/* END */ /* END */

View File

@ -19,8 +19,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef AHHINT_H #ifndef __AHHINT_H__
#define AHHINT_H #define __AHHINT_H__
#include <ft2build.h> #include <ft2build.h>
@ -29,6 +29,7 @@
FT_BEGIN_HEADER FT_BEGIN_HEADER
#define AH_HINT_DEFAULT 0 #define AH_HINT_DEFAULT 0
#define AH_HINT_NO_ALIGNMENT 1 #define AH_HINT_NO_ALIGNMENT 1
#define AH_HINT_NO_HORZ_EDGES 0x20000L #define AH_HINT_NO_HORZ_EDGES 0x20000L
@ -65,9 +66,10 @@ FT_BEGIN_HEADER
void ah_hinter_done_global_hints( AH_Hinter* hinter, void ah_hinter_done_global_hints( AH_Hinter* hinter,
void* global_hints ); void* global_hints );
FT_END_HEADER FT_END_HEADER
#endif /* AHHINT_H */ #endif /* __AHHINT_H__ */
/* END */ /* END */

View File

@ -32,13 +32,16 @@
/*************************************************************************/ /*************************************************************************/
#ifndef AHLOADER_H #ifndef __AHLOADER_H__
#define AHLOADER_H #define __AHLOADER_H__
#include <ft2build.h> #include <ft2build.h>
FT_BEGIN_HEADER FT_BEGIN_HEADER
#ifdef _STANDALONE_ #ifdef _STANDALONE_
typedef struct AH_GlyphLoad_ typedef struct AH_GlyphLoad_
@ -121,9 +124,10 @@ FT_BEGIN_HEADER
#endif /* _STANDALONE_ */ #endif /* _STANDALONE_ */
FT_END_HEADER FT_END_HEADER
#endif /* AHLOADER_H */ #endif /* __AHLOADER_H__ */
/* END */ /* END */

View File

@ -19,20 +19,24 @@
/***************************************************************************/ /***************************************************************************/
#ifndef AHMODULE_H #ifndef __AHMODULE_H__
#define AHMODULE_H #define __AHMODULE_H__
#include <ft2build.h> #include <ft2build.h>
#include FT_MODULE_H #include FT_MODULE_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
FT_CALLBACK_TABLE FT_CALLBACK_TABLE
const FT_Module_Class autohint_module_class; const FT_Module_Class autohint_module_class;
FT_END_HEADER FT_END_HEADER
#endif /* AHMODULE_H */ #endif /* __AHMODULE_H__ */
/* END */ /* END */

View File

@ -19,8 +19,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef AHOPTIM_H #ifndef __AHOPTIM_H__
#define AHOPTIM_H #define __AHOPTIM_H__
#include <ft2build.h> #include <ft2build.h>
@ -128,7 +128,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* AHOPTIM_H */ #endif /* __AHOPTIM_H__ */
/* END */ /* END */

View File

@ -20,8 +20,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef AHTYPES_H #ifndef __AHTYPES_H__
#define AHTYPES_H #define __AHTYPES_H__
#include <ft2build.h> #include <ft2build.h>
@ -46,6 +46,7 @@
FT_BEGIN_HEADER FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
/*************************************************************************/ /*************************************************************************/
/*************************************************************************/ /*************************************************************************/
@ -484,7 +485,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* AHTYPES_H */ #endif /* __AHTYPES_H__ */
/* END */ /* END */

View File

@ -16,12 +16,14 @@
/***************************************************************************/ /***************************************************************************/
#ifndef CFFDRIVER_H #ifndef __CFFDRIVER_H__
#define CFFDRIVER_H #define __CFFDRIVER_H__
#include <ft2build.h> #include <ft2build.h>
#include FT_INTERNAL_DRIVER_H #include FT_INTERNAL_DRIVER_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
@ -31,7 +33,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* CFFDRIVER_H */ #endif /* __CFFDRIVER_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef CFFLOAD_H #ifndef __CFFLOAD_H__
#define CFFLOAD_H #define __CFFLOAD_H__
#include <ft2build.h> #include <ft2build.h>
@ -64,7 +64,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* CFFLOAD_H */ #endif /* __CFFLOAD_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef T2OBJS_H #ifndef __CFFOBJS_H__
#define T2OBJS_H #define __CFFOBJS_H__
#include <ft2build.h> #include <ft2build.h>
@ -138,7 +138,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* T2OBJS_H */ #endif /* __CFFOBJS_H__ */
/* END */ /* END */

View File

@ -16,15 +16,18 @@
/***************************************************************************/ /***************************************************************************/
#ifndef T2GLOAD_H #ifndef __T2GLOAD_H__
#define T2GLOAD_H #define __T2GLOAD_H__
#include <ft2build.h> #include <ft2build.h>
#include FT_FREETYPE_H #include FT_FREETYPE_H
#include FT_SOURCE_FILE(cff,cffobjs.h) #include FT_SOURCE_FILE(cff,cffobjs.h)
FT_BEGIN_HEADER FT_BEGIN_HEADER
#define T2_MAX_OPERANDS 48 #define T2_MAX_OPERANDS 48
#define T2_MAX_SUBRS_CALLS 32 #define T2_MAX_SUBRS_CALLS 32
@ -194,7 +197,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* T2GLOAD_H */ #endif /* __T2GLOAD_H__ */
/* END */ /* END */

View File

@ -16,8 +16,9 @@
/***************************************************************************/ /***************************************************************************/
#ifndef CIDAFM_H #ifndef __CIDAFM_H__
#define CIDAFM_H #define __CIDAFM_H__
#include <ft2build.h> #include <ft2build.h>
#include FT_SOURCE_FILE(cid,cidobjs.h) #include FT_SOURCE_FILE(cid,cidobjs.h)
@ -60,7 +61,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* CIDAFM_H */ #endif /* __CIDAFM_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef CIDGLOAD_H #ifndef __CIDGLOAD_H__
#define CIDGLOAD_H #define __CIDGLOAD_H__
#include <ft2build.h> #include <ft2build.h>
@ -26,6 +26,7 @@
FT_BEGIN_HEADER FT_BEGIN_HEADER
#if 0 #if 0
/* Compute the maximum advance width of a font through quick parsing */ /* Compute the maximum advance width of a font through quick parsing */
@ -44,7 +45,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* CIDGLOAD_H */ #endif /* __CIDGLOAD_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef CIDLOAD_H #ifndef __CIDLOAD_H__
#define CIDLOAD_H #define __CIDLOAD_H__
#include <ft2build.h> #include <ft2build.h>
@ -51,7 +51,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* CIDLOAD_H */ #endif /* __CIDLOAD_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef CIDOBJS_H #ifndef __CIDOBJS_H__
#define CIDOBJS_H #define __CIDOBJS_H__
#include <ft2build.h> #include <ft2build.h>
@ -29,6 +29,7 @@
FT_BEGIN_HEADER FT_BEGIN_HEADER
/* The following structures must be defined by the hinter */ /* The following structures must be defined by the hinter */
typedef struct CID_Size_Hints_ CID_Size_Hints; typedef struct CID_Size_Hints_ CID_Size_Hints;
typedef struct CID_Glyph_Hints_ CID_Glyph_Hints; typedef struct CID_Glyph_Hints_ CID_Glyph_Hints;
@ -131,7 +132,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* CIDOBJS_H */ #endif /* __CIDOBJS_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef CIDPARSE_H #ifndef __CIDPARSE_H__
#define CIDPARSE_H #define __CIDPARSE_H__
#include <ft2build.h> #include <ft2build.h>
@ -110,7 +110,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* CIDPARSE_H */ #endif /* __CIDPARSE_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef CIDRIVER_H #ifndef __CIDRIVER_H__
#define CIDRIVER_H #define __CIDRIVER_H__
#include <ft2build.h> #include <ft2build.h>
@ -33,7 +33,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* CIDRIVER_H */ #endif /* __CIDRIVER_H__ */
/* END */ /* END */

View File

@ -1,6 +1,6 @@
/***************************************************************************/ /***************************************************************************/
/* */ /* */
/* cff.c */ /* type1cid.c */
/* */ /* */
/* FreeType OpenType driver component (body only). */ /* FreeType OpenType driver component (body only). */
/* */ /* */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef PSAUXMOD_H #ifndef __PSAUXMOD_H__
#define PSAUXMOD_H #define __PSAUXMOD_H__
#include <ft2build.h> #include <ft2build.h>
@ -32,7 +32,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* PSAUXMOD_H */ #endif /* __PSAUXMOD_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef PSOBJS_H #ifndef __PSOBJS_H__
#define PSOBJS_H #define __PSOBJS_H__
#include <ft2build.h> #include <ft2build.h>
@ -197,7 +197,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* PSOBJS_H */ #endif /* __PSOBJS_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef T1DECODE_H #ifndef __T1DECODE_H__
#define T1DECODE_H #define __T1DECODE_H__
#include <ft2build.h> #include <ft2build.h>
@ -57,7 +57,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* T1DECODE_H */ #endif /* __T1DECODE_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef PSDRIVER_H #ifndef __PSMODULE_H__
#define PSDRIVER_H #define __PSMODULE_H__
#include <ft2build.h> #include <ft2build.h>
@ -32,7 +32,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* PSDRIVER_H */ #endif /* __PSMODULE_H__ */
/* END */ /* END */

View File

@ -21,7 +21,5 @@
#include <ft2build.h> #include <ft2build.h>
#include FT_SOURCE_FILE(psnames,psmodule.c) #include FT_SOURCE_FILE(psnames,psmodule.c)
#endif
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef FTRASTER_H #ifndef __FTRASTER_H__
#define FTRASTER_H #define __FTRASTER_H__
#include <ft2build.h> #include <ft2build.h>
@ -40,7 +40,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* FTRASTER_H */ #endif /* __FTRASTER_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef FTREND1_H #ifndef __FTREND1_H__
#define FTREND1_H #define __FTREND1_H__
#include <ft2build.h> #include <ft2build.h>
@ -38,7 +38,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* FTREND1_H */ #endif /* __FTREND1_H__ */
/* END */ /* END */

View File

@ -1,6 +1,6 @@
/***************************************************************************/ /***************************************************************************/
/* */ /* */
/* raster1.c */ /* raster.c */
/* */ /* */
/* FreeType monochrome rasterer module component (body only). */ /* FreeType monochrome rasterer module component (body only). */
/* */ /* */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef SFDRIVER_H #ifndef __SFDRIVER_H__
#define SFDRIVER_H #define __SFDRIVER_H__
#include <ft2build.h> #include <ft2build.h>
@ -32,7 +32,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* SFDRIVER_H */ #endif /* __SFDRIVER_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef SFOBJS_H #ifndef __SFOBJS_H__
#define SFOBJS_H #define __SFOBJS_H__
#include <ft2build.h> #include <ft2build.h>
@ -27,6 +27,7 @@
FT_BEGIN_HEADER FT_BEGIN_HEADER
FT_LOCAL FT_LOCAL
FT_Error SFNT_Init_Face( FT_Stream stream, FT_Error SFNT_Init_Face( FT_Stream stream,
TT_Face face, TT_Face face,
@ -47,7 +48,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* SFDRIVER_H */ #endif /* __SFDRIVER_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef TTCMAP_H #ifndef __TTCMAP_H__
#define TTCMAP_H #define __TTCMAP_H__
#include <ft2build.h> #include <ft2build.h>
@ -39,7 +39,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* TTCMAP_H */ #endif /* __TTCMAP_H__ */
/* END */ /* END */

View File

@ -17,8 +17,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef TTLOAD_H #ifndef __TTLOAD_H__
#define TTLOAD_H #define __TTLOAD_H__
#include <ft2build.h> #include <ft2build.h>
@ -130,7 +130,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* TTLOAD_H */ #endif /* __TTLOAD_H__ */
/* END */ /* END */

View File

@ -17,8 +17,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef TTPOST_H #ifndef __TTPOST_H__
#define TTPOST_H #define __TTPOST_H__
#include <ft2build.h> #include <ft2build.h>
@ -44,7 +44,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* TTPOST_H */ #endif /* __TTPOST_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef TTSBIT_H #ifndef __TTSBIT_H__
#define TTSBIT_H #define __TTSBIT_H__
#include <ft2build.h> #include <ft2build.h>
@ -53,7 +53,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* TTSBIT_H */ #endif /* __TTSBIT_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef FTGRAYS_H #ifndef __FTGRAYS_H__
#define FTGRAYS_H #define __FTGRAYS_H__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -51,7 +51,7 @@
} }
#endif #endif
#endif /* FTGRAYS_H */ #endif /* __FTGRAYS_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef FTSMOOTH_H #ifndef __FTSMOOTH_H__
#define FTSMOOTH_H #define __FTSMOOTH_H__
#include <ft2build.h> #include <ft2build.h>
@ -38,7 +38,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* FTSMOOTH_H */ #endif /* __FTSMOOTH_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef TTDRIVER_H #ifndef __TTDRIVER_H__
#define TTDRIVER_H #define __TTDRIVER_H__
#include <ft2build.h> #include <ft2build.h>
@ -32,7 +32,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* TTDRIVER_H */ #endif /* __TTDRIVER_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef TTGLOAD_H #ifndef __TTGLOAD_H__
#define TTGLOAD_H #define __TTGLOAD_H__
#include <ft2build.h> #include <ft2build.h>
@ -49,7 +49,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* TTGLOAD_H */ #endif /* __TTGLOAD_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef TTINTERP_H #ifndef __TTINTERP_H__
#define TTINTERP_H #define __TTINTERP_H__
#include <ft2build.h> #include <ft2build.h>
@ -304,7 +304,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* TTINTERP_H */ #endif /* __TTINTERP_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef TTOBJS_H #ifndef __TTOBJS_H__
#define TTOBJS_H #define __TTOBJS_H__
#include <ft2build.h> #include <ft2build.h>
@ -417,7 +417,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* TTOBJS_H */ #endif /* __TTOBJS_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef TTPLOAD_H #ifndef __TTPLOAD_H__
#define TTPLOAD_H #define __TTPLOAD_H__
#include <ft2build.h> #include <ft2build.h>
@ -42,7 +42,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* TTPLOAD_H */ #endif /* __TTPLOAD_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef T1AFM_H #ifndef __T1AFM_H__
#define T1AFM_H #define __T1AFM_H__
#include <ft2build.h> #include <ft2build.h>
#include FT_SOURCE_FILE(type1,t1objs.h) #include FT_SOURCE_FILE(type1,t1objs.h)
@ -60,7 +60,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* T1AFM_H */ #endif /* __T1AFM_H__ */
/* END */ /* END */

View File

@ -15,6 +15,7 @@
/* */ /* */
/***************************************************************************/ /***************************************************************************/
#include <ft2build.h> #include <ft2build.h>
#include FT_SOURCE_FILE(type1,t1driver.h) #include FT_SOURCE_FILE(type1,t1driver.h)
#include FT_SOURCE_FILE(type1,t1gload.h) #include FT_SOURCE_FILE(type1,t1gload.h)

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef T1DRIVER_H #ifndef __T1DRIVER_H__
#define T1DRIVER_H #define __T1DRIVER_H__
#include <ft2build.h> #include <ft2build.h>
@ -32,7 +32,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* T1DRIVER_H */ #endif /* __T1DRIVER_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef T1GLOAD_H #ifndef __T1GLOAD_H__
#define T1GLOAD_H #define __T1GLOAD_H__
#include <ft2build.h> #include <ft2build.h>
@ -40,7 +40,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* T1GLOAD_H */ #endif /* __T1GLOAD_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef T1LOAD_H #ifndef __T1LOAD_H__
#define T1LOAD_H #define __T1LOAD_H__
#include <ft2build.h> #include <ft2build.h>
@ -77,7 +77,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* T1LOAD_H */ #endif /* __T1LOAD_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef T1OBJS_H #ifndef __T1OBJS_H__
#define T1OBJS_H #define __T1OBJS_H__
#include <ft2build.h> #include <ft2build.h>
@ -155,7 +155,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* T1OBJS_H */ #endif /* __T1OBJS_H__ */
/* END */ /* END */

View File

@ -16,8 +16,8 @@
/***************************************************************************/ /***************************************************************************/
#ifndef T1PARSE_H #ifndef __T1PARSE_H__
#define T1PARSE_H #define __T1PARSE_H__
#include <ft2build.h> #include <ft2build.h>
@ -128,7 +128,7 @@ FT_BEGIN_HEADER
FT_END_HEADER FT_END_HEADER
#endif /* T1PARSE_H */ #endif /* __T1PARSE_H__ */
/* END */ /* END */

View File

@ -16,22 +16,13 @@
/***************************************************************************/ /***************************************************************************/
#ifdef FT_FLAT_COMPILE #include <ft2build.h>
#include FT_ERRORS_H
#include "winfnt.h" #include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H
#else #include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_FNT_TYPES_H
#include <winfonts/winfnt.h> #include FT_SOURCE_FILE(winfonts,winfnt.h)
#endif
#include <freetype/fterrors.h>
#include <freetype/internal/ftstream.h>
#include <freetype/internal/ftdebug.h>
#include <freetype/internal/ftobjs.h>
#include <freetype/internal/fnttypes.h>
/*************************************************************************/ /*************************************************************************/

View File

@ -16,26 +16,24 @@
/***************************************************************************/ /***************************************************************************/
#ifndef WINFNT_H #ifndef __WINFNT_H__
#define WINFNT_H #define __WINFNT_H__
#include <freetype/internal/ftdriver.h>
#ifdef __cplusplus #include <ft2build.h>
extern "C" { #include FT_INTERNAL_DRIVER_H
#endif
FT_BEGIN_HEADER
FT_EXPORT_VAR( const FT_Driver_Class ) winfnt_driver_class; FT_EXPORT_VAR( const FT_Driver_Class ) winfnt_driver_class;
#ifdef __cplusplus FT_END_HEADER
}
#endif
#endif /* WINFNT_H */ #endif /* __WINFNT_H__ */
/* END */ /* END */