diff options
Diffstat (limited to 'include')
27 files changed, 381 insertions, 372 deletions
diff --git a/include/freetype/cache/ftcchunk.h b/include/freetype/cache/ftcchunk.h index 7ef2f8ac6..afee39e0e 100644 --- a/include/freetype/cache/ftcchunk.h +++ b/include/freetype/cache/ftcchunk.h @@ -164,10 +164,10 @@ /* cache sub-system internals. */ /* */ - FT_EXPORT_FUNC( FT_Error ) FTC_ChunkNode_Init( FTC_ChunkNode node, - FTC_ChunkSet cset, - FT_UInt index, - FT_Bool alloc ); + FT_EXPORT( FT_Error ) FTC_ChunkNode_Init( FTC_ChunkNode node, + FTC_ChunkSet cset, + FT_UInt index, + FT_Bool alloc ); #define FTC_ChunkNode_Ref( n ) \ FTC_CACHENODE_TO_DATA_P( &(n)->root )->ref_count++ @@ -176,18 +176,18 @@ FTC_CACHENODE_TO_DATA_P( &(n)->root )->ref_count-- - FT_EXPORT_DEF( void ) FTC_ChunkNode_Destroy( FTC_ChunkNode node ); + FT_EXPORT( void ) FTC_ChunkNode_Destroy( FTC_ChunkNode node ); - FT_EXPORT_DEF( FT_Error ) FTC_Chunk_Cache_Init( FTC_Chunk_Cache cache ); + FT_EXPORT( FT_Error ) FTC_Chunk_Cache_Init( FTC_Chunk_Cache cache ); - FT_EXPORT_DEF( void ) FTC_Chunk_Cache_Done( FTC_Chunk_Cache cache ); + FT_EXPORT( void ) FTC_Chunk_Cache_Done( FTC_Chunk_Cache cache ); - FT_EXPORT_DEF( FT_Error ) FTC_ChunkSet_New( FTC_Chunk_Cache cache, - FT_Pointer type, - FTC_ChunkSet* aset ); + FT_EXPORT( FT_Error ) FTC_ChunkSet_New( FTC_Chunk_Cache cache, + FT_Pointer type, + FTC_ChunkSet* aset ); - FT_EXPORT_DEF( FT_Error ) FTC_ChunkSet_Lookup_Node( + FT_EXPORT( FT_Error ) FTC_ChunkSet_Lookup_Node( FTC_ChunkSet cset, FT_UInt glyph_index, FTC_ChunkNode* anode, diff --git a/include/freetype/cache/ftcglyph.h b/include/freetype/cache/ftcglyph.h index 8a0acbd88..111600612 100644 --- a/include/freetype/cache/ftcglyph.h +++ b/include/freetype/cache/ftcglyph.h @@ -168,7 +168,7 @@ /* cache sub-system internals. */ /* */ - FT_EXPORT_FUNC( void ) FTC_GlyphNode_Init( FTC_GlyphNode node, + FT_EXPORT_DEF( void ) FTC_GlyphNode_Init( FTC_GlyphNode node, FTC_GlyphSet gset, FT_UInt gindex ); @@ -179,19 +179,19 @@ FTC_CACHENODE_TO_DATA_P( &(n)->root )->ref_count-- - FT_EXPORT_DEF( void ) FTC_GlyphNode_Destroy( FTC_GlyphNode node, - FTC_Glyph_Cache cache ); + FT_EXPORT( void ) FTC_GlyphNode_Destroy( FTC_GlyphNode node, + FTC_Glyph_Cache cache ); - FT_EXPORT_DEF( FT_Error ) FTC_Glyph_Cache_Init( FTC_Glyph_Cache cache ); + FT_EXPORT( FT_Error ) FTC_Glyph_Cache_Init( FTC_Glyph_Cache cache ); - FT_EXPORT_DEF( void ) FTC_Glyph_Cache_Done( FTC_Glyph_Cache cache ); + FT_EXPORT( void ) FTC_Glyph_Cache_Done( FTC_Glyph_Cache cache ); - FT_EXPORT_DEF( FT_Error ) FTC_GlyphSet_New( FTC_Glyph_Cache cache, - FT_Pointer type, - FTC_GlyphSet* aset ); + FT_EXPORT( FT_Error ) FTC_GlyphSet_New( FTC_Glyph_Cache cache, + FT_Pointer type, + FTC_GlyphSet* aset ); - FT_EXPORT_DEF( FT_Error ) FTC_GlyphSet_Lookup_Node( + FT_EXPORT( FT_Error ) FTC_GlyphSet_Lookup_Node( FTC_GlyphSet gset, FT_UInt glyph_index, FTC_GlyphNode* anode ); diff --git a/include/freetype/cache/ftcimage.h b/include/freetype/cache/ftcimage.h index 24febe754..bf5435c12 100644 --- a/include/freetype/cache/ftcimage.h +++ b/include/freetype/cache/ftcimage.h @@ -119,8 +119,8 @@ /* <Return> */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT_DEF( FT_Error ) FTC_Image_Cache_New( FTC_Manager manager, - FTC_Image_Cache* acache ); + FT_EXPORT( FT_Error ) FTC_Image_Cache_New( FTC_Manager manager, + FTC_Image_Cache* acache ); /*************************************************************************/ @@ -154,10 +154,10 @@ /* taken by the glyphs it holds, the returned glyph might disappear */ /* on a later invocation of this function! It's a cache after all... */ /* */ - FT_EXPORT_DEF( FT_Error ) FTC_Image_Cache_Lookup( FTC_Image_Cache cache, - FTC_Image_Desc* desc, - FT_UInt gindex, - FT_Glyph* aglyph ); + FT_EXPORT( FT_Error ) FTC_Image_Cache_Lookup( FTC_Image_Cache cache, + FTC_Image_Desc* desc, + FT_UInt gindex, + FT_Glyph* aglyph ); #ifdef __cplusplus diff --git a/include/freetype/cache/ftcmanag.h b/include/freetype/cache/ftcmanag.h index 32024d8e5..f8e21e9b7 100644 --- a/include/freetype/cache/ftcmanag.h +++ b/include/freetype/cache/ftcmanag.h @@ -155,7 +155,7 @@ /* The reason this function is exported is to allow client-specific */ /* cache classes. */ /* */ - FT_EXPORT_DEF( void ) FTC_Manager_Compress( FTC_Manager manager ); + FT_EXPORT( void ) FTC_Manager_Compress( FTC_Manager manager ); /*************************************************************************/ diff --git a/include/freetype/cache/ftcsbits.h b/include/freetype/cache/ftcsbits.h index 9266c8601..71c28a1e5 100644 --- a/include/freetype/cache/ftcsbits.h +++ b/include/freetype/cache/ftcsbits.h @@ -53,13 +53,13 @@ } FTC_SBitRec; - FT_EXPORT_DEF( FT_Error ) FTC_SBit_Cache_New( FTC_Manager manager, - FTC_SBit_Cache* acache ); + FT_EXPORT( FT_Error ) FTC_SBit_Cache_New( FTC_Manager manager, + FTC_SBit_Cache* acache ); - FT_EXPORT_DEF( FT_Error ) FTC_SBit_Cache_Lookup( FTC_SBit_Cache cache, - FTC_Image_Desc* desc, - FT_UInt gindex, - FTC_SBit *sbit ); + FT_EXPORT( FT_Error ) FTC_SBit_Cache_Lookup( FTC_SBit_Cache cache, + FTC_Image_Desc* desc, + FT_UInt gindex, + FTC_SBit *sbit ); #ifdef __cplusplus diff --git a/include/freetype/cache/ftlru.h b/include/freetype/cache/ftlru.h index 71dd55782..25fa3fb0d 100644 --- a/include/freetype/cache/ftlru.h +++ b/include/freetype/cache/ftlru.h @@ -141,33 +141,33 @@ } FT_LruRec; - FT_EXPORT_DEF( FT_Error ) FT_Lru_New( const FT_Lru_Class* clazz, - FT_UInt max_elements, - FT_Pointer user_data, - FT_Memory memory, - FT_Bool pre_alloc, - FT_Lru* alru ); + FT_EXPORT( FT_Error ) FT_Lru_New( const FT_Lru_Class* clazz, + FT_UInt max_elements, + FT_Pointer user_data, + FT_Memory memory, + FT_Bool pre_alloc, + FT_Lru* alru ); - FT_EXPORT_DEF( void ) FT_Lru_Reset( FT_Lru lru ); + FT_EXPORT( void ) FT_Lru_Reset( FT_Lru lru ); - FT_EXPORT_DEF( void ) FT_Lru_Done ( FT_Lru lru ); + FT_EXPORT( void ) FT_Lru_Done ( FT_Lru lru ); - FT_EXPORT_DEF( FT_Error ) FT_Lru_Lookup_Node( FT_Lru lru, - FT_LruKey key, - FT_LruNode* anode ); + FT_EXPORT( FT_Error ) FT_Lru_Lookup_Node( FT_Lru lru, + FT_LruKey key, + FT_LruNode* anode ); - FT_EXPORT_DEF( FT_Error ) FT_Lru_Lookup( FT_Lru lru, - FT_LruKey key, - FT_Pointer* aobject ); + FT_EXPORT( FT_Error ) FT_Lru_Lookup( FT_Lru lru, + FT_LruKey key, + FT_Pointer* aobject ); - FT_EXPORT_DEF( void ) FT_Lru_Remove_Node( FT_Lru lru, - FT_LruNode node ); + FT_EXPORT( void ) FT_Lru_Remove_Node( FT_Lru lru, + FT_LruNode node ); - FT_EXPORT_DEF( void ) FT_Lru_Remove_Selection( FT_Lru lru, - FT_Lru_Selector selector, - FT_Pointer data ); + FT_EXPORT( void ) FT_Lru_Remove_Selection( FT_Lru lru, + FT_Lru_Selector selector, + FT_Pointer data ); #ifdef __cplusplus diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h index 7e0892764..9fe7f5d09 100644 --- a/include/freetype/config/ftconfig.h +++ b/include/freetype/config/ftconfig.h @@ -159,64 +159,64 @@ #ifdef FT_MAKE_OPTION_SINGLE_OBJECT -#define LOCAL_DEF static -#define LOCAL_FUNC static +#define FT_LOCAL static +#define FT_LOCAL_DEF static #else #ifdef __cplusplus -#define LOCAL_DEF extern "C" -#define LOCAL_FUNC extern "C" +#define FT_LOCAL extern "C" +#define FT_LOCAL_DEF extern "C" #else -#define LOCAL_DEF extern -#define LOCAL_FUNC extern +#define FT_LOCAL extern +#define FT_LOCAL_DEF extern #endif #endif /* FT_MAKE_OPTION_SINGLE_OBJECT */ -#ifndef BASE_DEF +#ifndef FT_BASE #ifdef __cplusplus -#define BASE_DEF( x ) extern "C" x +#define FT_BASE( x ) extern "C" x #else -#define BASE_DEF( x ) extern x +#define FT_BASE( x ) extern x #endif -#endif /* !BASE_DEF */ +#endif /* !FT_BASE */ -#ifndef BASE_FUNC +#ifndef FT_BASE_DEF #ifdef __cplusplus -#define BASE_FUNC( x ) extern "C" x +#define FT_BASE_DEF( x ) extern "C" x #else -#define BASE_FUNC( x ) extern x +#define FT_BASE_DEF( x ) extern x #endif -#endif /* !BASE_FUNC */ +#endif /* !FT_BASE_DEF */ -#ifndef FT_EXPORT_DEF +#ifndef FT_EXPORT #ifdef __cplusplus -#define FT_EXPORT_DEF( x ) extern "C" x +#define FT_EXPORT( x ) extern "C" x #else -#define FT_EXPORT_DEF( x ) extern x +#define FT_EXPORT( x ) extern x #endif -#endif /* !FT_EXPORT_DEF */ +#endif /* !FT_EXPORT */ -#ifndef FT_EXPORT_FUNC +#ifndef FT_EXPORT_DEF #ifdef __cplusplus -#define FT_EXPORT_FUNC( x ) extern "C" x +#define FT_EXPORT_DEF( x ) extern "C" x #else -#define FT_EXPORT_FUNC( x ) extern x +#define FT_EXPORT_DEF( x ) extern x #endif -#endif /* !FT_EXPORT_FUNC */ +#endif /* !FT_EXPORT_DEF */ #ifndef FT_EXPORT_VAR @@ -229,6 +229,10 @@ #endif /* !FT_EXPORT_VAR */ + /* the following macros are needed to compile the library with a */ + /* C++ compiler. Werner insisted on being able to do that even */ + /* though we explicitely do not support C++ compilation */ + /* */ /* This is special. Within C++, you must specify `extern "C"' for */ /* functions which are used via function pointers, and you also */ @@ -236,21 +240,26 @@ /* assure C linkage -- it's not possible to have (local) anonymous */ /* functions which are accessed by (global) function pointers. */ /* */ + /* */ + /* FT_CALLBACK_DEF is used to _define_ a callback function */ + /* */ + /* FT_CALLBACK_TABLE is used to _declare_ a constant variable */ + /* that contains pointers to callback functions */ + /* */ + /* FT_CALLBACK_TABLE_DEF is used to _define_ a constant variable */ + /* that contains pointers to callback functions */ + /* */ #ifdef __cplusplus -#define LOCAL_VAR extern "C" - -#define LOCAL_FUNC_X extern "C" - -#define FT_CPLUSPLUS( x ) extern "C" x +#define FT_CALLBACK_DEF extern "C" +#define FT_CALLBACK_TABLE extern "C" +#define FT_CALLBACK_TABLE_DEF extern "C" #else -#define LOCAL_VAR extern - -#define LOCAL_FUNC_X static - -#define FT_CPLUSPLUS( x ) x +#define FT_CALLBACK_DEF static +#define FT_CALLBACK_TABLE extern +#define FT_CALLBACK_TABLE_DEF #endif /* __cplusplus */ diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h index 2e4330d27..032c842d5 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -155,34 +155,34 @@ /* declarations. */ /* */ /* Two macros are used within the FreeType source code to define */ - /* exported library functions: FT_EXPORT_DEF and FT_EXPORT_FUNC. */ + /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */ /* */ - /* FT_EXPORT_DEF( return_type ) */ + /* FT_EXPORT( return_type ) */ /* */ /* is used in a function declaration, as in */ /* */ - /* FT_EXPORT_DEF( FT_Error ) */ + /* FT_EXPORT( FT_Error ) */ /* FT_Init_FreeType( FT_Library* alibrary ); */ /* */ /* */ - /* FT_EXPORT_FUNC( return_type ) */ + /* FT_EXPORT_DEF( return_type ) */ /* */ /* is used in a function definition, as in */ /* */ - /* FT_EXPORT_FUNC( FT_Error ) */ + /* FT_EXPORT_DEF( FT_Error ) */ /* FT_Init_FreeType( FT_Library* alibrary ) */ /* { */ /* ... some code ... */ /* return FT_Err_Ok; */ /* } */ /* */ - /* You can provide your own implementation of FT_EXPORT_DEF and */ - /* FT_EXPORT_FUNC here if you want. If you leave them undefined, they */ + /* You can provide your own implementation of FT_EXPORT and */ + /* FT_EXPORT_DEF here if you want. If you leave them undefined, they */ /* will be later automatically defined as `extern return_type' to */ /* allow normal compilation. */ /* */ +#undef FT_EXPORT #undef FT_EXPORT_DEF -#undef FT_EXPORT_FUNC /*************************************************************************/ diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 32191bb0d..ce09e80d7 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -1099,9 +1099,6 @@ /* Note that the app will need to know about the */ /* image format. */ /* */ - /* loader :: This is a private object for the glyph slot. */ - /* Do not touch this. */ - /* */ /* <Note> */ /* If FT_Load_Glyph() is called with default flags (FT_LOAD_DEFAULT), */ /* the glyph image is loaded in the glyph slot in its native format */ @@ -1152,6 +1149,9 @@ /*@private begin */ FT_GlyphLoader* loader; + FT_Bool glyph_transformed; + FT_Matrix glyph_matrix; + FT_Vector glyph_delta; /*@private end */ @@ -1182,7 +1182,7 @@ /* <Return> */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Init_FreeType( FT_Library* library ); + FT_EXPORT( FT_Error ) FT_Init_FreeType( FT_Library* library ); /*************************************************************************/ @@ -1200,7 +1200,7 @@ /* <Return> */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Done_FreeType( FT_Library library ); + FT_EXPORT( FT_Error ) FT_Done_FreeType( FT_Library library ); /*************************************************************************/ @@ -1361,10 +1361,10 @@ /* `*face'. Its return value should be 0 if the resource is */ /* recognized, or non-zero if not. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_New_Face( FT_Library library, - const char* filepathname, - FT_Long face_index, - FT_Face* face ); + FT_EXPORT( FT_Error ) FT_New_Face( FT_Library library, + const char* filepathname, + FT_Long face_index, + FT_Face* face ); /*************************************************************************/ @@ -1407,11 +1407,11 @@ /* `*face'. Its return value should be 0 if the resource is */ /* recognized, or non-zero if not. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_New_Memory_Face( FT_Library library, - FT_Byte* file_base, - FT_Long file_size, - FT_Long face_index, - FT_Face* face ); + FT_EXPORT( FT_Error ) FT_New_Memory_Face( FT_Library library, + FT_Byte* file_base, + FT_Long file_size, + FT_Long face_index, + FT_Face* face ); /*************************************************************************/ @@ -1454,10 +1454,10 @@ /* `*face'. Its return value should be 0 if the resource is */ /* recognized, or non-zero if not. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Open_Face( FT_Library library, - FT_Open_Args* args, - FT_Long face_index, - FT_Face* face ); + FT_EXPORT( FT_Error ) FT_Open_Face( FT_Library library, + FT_Open_Args* args, + FT_Long face_index, + FT_Face* face ); /*************************************************************************/ @@ -1492,8 +1492,8 @@ /* when invoking this function. Most drivers simply do not implement */ /* file attachments. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Attach_File( FT_Face face, - const char* filepathname ); + FT_EXPORT( FT_Error ) FT_Attach_File( FT_Face face, + const char* filepathname ); /*************************************************************************/ @@ -1522,8 +1522,8 @@ /* when invoking this function. Most drivers simply do not implement */ /* file attachments. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Attach_Stream( FT_Face face, - FT_Open_Args* parameters ); + FT_EXPORT( FT_Error ) FT_Attach_Stream( FT_Face face, + FT_Open_Args* parameters ); /*************************************************************************/ @@ -1541,7 +1541,7 @@ /* <Return> */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Done_Face( FT_Face face ); + FT_EXPORT( FT_Error ) FT_Done_Face( FT_Face face ); /*************************************************************************/ @@ -1578,11 +1578,11 @@ /* When dealing with fixed-size faces (i.e., non-scalable formats), */ /* use the function FT_Set_Pixel_Sizes(). */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Set_Char_Size( FT_Face face, - FT_F26Dot6 char_width, - FT_F26Dot6 char_height, - FT_UInt horz_resolution, - FT_UInt vert_resolution ); + FT_EXPORT( FT_Error ) FT_Set_Char_Size( FT_Face face, + FT_F26Dot6 char_width, + FT_F26Dot6 char_height, + FT_UInt horz_resolution, + FT_UInt vert_resolution ); /*************************************************************************/ @@ -1608,9 +1608,9 @@ /* <Return> */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Set_Pixel_Sizes( FT_Face face, - FT_UInt pixel_width, - FT_UInt pixel_height ); + FT_EXPORT( FT_Error ) FT_Set_Pixel_Sizes( FT_Face face, + FT_UInt pixel_width, + FT_UInt pixel_height ); /*************************************************************************/ @@ -1646,9 +1646,9 @@ /* Note that this also transforms the `face.glyph.advance' field, but */ /* *not* the values in `face.glyph.metrics'. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Load_Glyph( FT_Face face, - FT_UInt glyph_index, - FT_Int load_flags ); + FT_EXPORT( FT_Error ) FT_Load_Glyph( FT_Face face, + FT_UInt glyph_index, + FT_Int load_flags ); /*************************************************************************/ @@ -1689,9 +1689,9 @@ /* Note that this also transforms the `face.glyph.advance' field, but */ /* *not* the values in `face.glyph.metrics'. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Load_Char( FT_Face face, - FT_ULong char_code, - FT_Int load_flags ); + FT_EXPORT( FT_Error ) FT_Load_Char( FT_Face face, + FT_ULong char_code, + FT_Int load_flags ); /*************************************************************************/ @@ -1927,9 +1927,9 @@ /* the transformation and is performed on the character size given in */ /* the last call to FT_Set_Char_Sizes() or FT_Set_Pixel_Sizes(). */ /* */ - FT_EXPORT_DEF( void ) FT_Set_Transform( FT_Face face, - FT_Matrix* matrix, - FT_Vector* delta ); + FT_EXPORT( void ) FT_Set_Transform( FT_Face face, + FT_Matrix* matrix, + FT_Vector* delta ); /*************************************************************************/ @@ -1988,8 +1988,8 @@ /* <Return> */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Render_Glyph( FT_GlyphSlot slot, - FT_UInt render_mode ); + FT_EXPORT( FT_Error ) FT_Render_Glyph( FT_GlyphSlot slot, + FT_UInt render_mode ); /*************************************************************************/ @@ -2053,11 +2053,11 @@ /* kernings, are out of the scope of this API function -- they can be */ /* implemented through format-specific interfaces. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Get_Kerning( FT_Face face, - FT_UInt left_glyph, - FT_UInt right_glyph, - FT_UInt kern_mode, - FT_Vector* kerning ); + FT_EXPORT( FT_Error ) FT_Get_Kerning( FT_Face face, + FT_UInt left_glyph, + FT_UInt right_glyph, + FT_UInt kern_mode, + FT_Vector* kerning ); /*************************************************************************/ @@ -2095,10 +2095,10 @@ /* macro FT_CONFIG_OPTION_NO_GLYPH_NAMES is defined in */ /* `include/freetype/config/ftoptions.h' */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Get_Glyph_Name( FT_Face face, - FT_UInt glyph_index, - FT_Pointer buffer, - FT_UInt buffer_max ); + FT_EXPORT( FT_Error ) FT_Get_Glyph_Name( FT_Face face, + FT_UInt glyph_index, + FT_Pointer buffer, + FT_UInt buffer_max ); /*************************************************************************/ @@ -2122,8 +2122,8 @@ /* This function will return an error if no charmap in the face */ /* corresponds to the encoding queried here. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Select_Charmap( FT_Face face, - FT_Encoding encoding ); + FT_EXPORT( FT_Error ) FT_Select_Charmap( FT_Face face, + FT_Encoding encoding ); /*************************************************************************/ @@ -2147,8 +2147,8 @@ /* the face (i.e., if it is not listed in the face->charmaps[] */ /* table). */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Set_Charmap( FT_Face face, - FT_CharMap charmap ); + FT_EXPORT( FT_Error ) FT_Set_Charmap( FT_Face face, + FT_CharMap charmap ); /*************************************************************************/ @@ -2168,8 +2168,8 @@ /* <Return> */ /* The glyph index. 0 means `undefined character code'. */ /* */ - FT_EXPORT_DEF( FT_UInt ) FT_Get_Char_Index( FT_Face face, - FT_ULong charcode ); + FT_EXPORT( FT_UInt ) FT_Get_Char_Index( FT_Face face, + FT_ULong charcode ); /*************************************************************************/ @@ -2195,9 +2195,9 @@ /* divide by zero; it simply returns `MaxInt' or `MinInt' depending */ /* on the signs of `a' and `b'. */ /* */ - FT_EXPORT_DEF( FT_Long ) FT_MulDiv( FT_Long a, - FT_Long b, - FT_Long c ); + FT_EXPORT( FT_Long ) FT_MulDiv( FT_Long a, + FT_Long b, + FT_Long c ); /*************************************************************************/ @@ -2229,8 +2229,8 @@ /* _second_ argument of this function; this can make a great */ /* difference. */ /* */ - FT_EXPORT_DEF( FT_Long ) FT_MulFix( FT_Long a, - FT_Long b ); + FT_EXPORT( FT_Long ) FT_MulFix( FT_Long a, + FT_Long b ); /*************************************************************************/ @@ -2256,8 +2256,8 @@ /* 32 bits, then the division is computed directly. Otherwise, we */ /* use a specialized version of the old FT_MulDiv64(). */ /* */ - FT_EXPORT_DEF( FT_Long ) FT_DivFix( FT_Long a, - FT_Long b ); + FT_EXPORT( FT_Long ) FT_DivFix( FT_Long a, + FT_Long b ); /*************************************************************************/ @@ -2280,8 +2280,8 @@ /* <Note> */ /* The result is undefined if either `vector' or `matrix' is invalid. */ /* */ - FT_EXPORT_DEF( void ) FT_Vector_Transform( FT_Vector* vec, - FT_Matrix* matrix ); + FT_EXPORT( void ) FT_Vector_Transform( FT_Vector* vec, + FT_Matrix* matrix ); /* */ diff --git a/include/freetype/ftbbox.h b/include/freetype/ftbbox.h index ffdd42386..629e231d7 100644 --- a/include/freetype/ftbbox.h +++ b/include/freetype/ftbbox.h @@ -58,8 +58,8 @@ /* <Return> */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Outline_Get_BBox( FT_Outline* outline, - FT_BBox* bbox ); + FT_EXPORT( FT_Error ) FT_Outline_Get_BBox( FT_Outline* outline, + FT_BBox* bbox ); #ifdef __cplusplus diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h index 0c14fdf43..1b26734d5 100644 --- a/include/freetype/ftcache.h +++ b/include/freetype/ftcache.h @@ -194,13 +194,13 @@ /* <Return> */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT_DEF( FT_Error ) FTC_Manager_New( FT_Library library, - FT_UInt max_faces, - FT_UInt max_sizes, - FT_ULong max_bytes, - FTC_Face_Requester requester, - FT_Pointer req_data, - FTC_Manager* amanager ); + FT_EXPORT( FT_Error ) FTC_Manager_New( FT_Library library, + FT_UInt max_faces, + FT_UInt max_sizes, + FT_ULong max_bytes, + FTC_Face_Requester requester, + FT_Pointer req_data, + FTC_Manager* amanager ); /*************************************************************************/ @@ -215,7 +215,7 @@ /* <Input> */ /* manager :: A handle to the manager. */ /* */ - FT_EXPORT_DEF( void ) FTC_Manager_Reset( FTC_Manager manager ); + FT_EXPORT( void ) FTC_Manager_Reset( FTC_Manager manager ); /*************************************************************************/ @@ -229,7 +229,7 @@ /* <Input> */ /* manager :: A handle to the target cache manager object. */ /* */ - FT_EXPORT_DEF( void ) FTC_Manager_Done( FTC_Manager manager ); + FT_EXPORT( void ) FTC_Manager_Done( FTC_Manager manager ); /*************************************************************************/ @@ -264,9 +264,9 @@ /* the FT_Set_Transform() function) on a returned face! If you need */ /* to transform glyphs, do it yourself after glyph loading. */ /* */ - FT_EXPORT_DEF( FT_Error ) FTC_Manager_Lookup_Face( FTC_Manager manager, - FTC_FaceID face_id, - FT_Face* aface ); + FT_EXPORT( FT_Error ) FTC_Manager_Lookup_Face( FTC_Manager manager, + FTC_FaceID face_id, + FT_Face* aface ); /*************************************************************************/ @@ -308,10 +308,10 @@ /* The returned size object is the face's current size, which means */ /* that you can call FT_Load_Glyph() with the face if you need to. */ /* */ - FT_EXPORT_DEF( FT_Error ) FTC_Manager_Lookup_Size( FTC_Manager manager, - FTC_Font font, - FT_Face* aface, - FT_Size* asize ); + FT_EXPORT( FT_Error ) FTC_Manager_Lookup_Size( FTC_Manager manager, + FTC_Font font, + FT_Face* aface, + FT_Size* asize ); /* a cache class is used to describe a unique cache type to the manager */ @@ -320,7 +320,7 @@ /* this must be used internally for the moment */ - FT_EXPORT_DEF( FT_Error ) FTC_Manager_Register_Cache( + FT_EXPORT( FT_Error ) FTC_Manager_Register_Cache( FTC_Manager manager, FTC_Cache_Class* clazz, FTC_Cache* acache ); diff --git a/include/freetype/ftglyph.h b/include/freetype/ftglyph.h index dc2ed0914..7aca54f03 100644 --- a/include/freetype/ftglyph.h +++ b/include/freetype/ftglyph.h @@ -161,8 +161,8 @@ /* <Return> */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Get_Glyph( FT_GlyphSlot slot, - FT_Glyph* aglyph ); + FT_EXPORT( FT_Error ) FT_Get_Glyph( FT_GlyphSlot slot, + FT_Glyph* aglyph ); /*************************************************************************/ @@ -183,8 +183,8 @@ /* <Return> */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Glyph_Copy( FT_Glyph source, - FT_Glyph* target ); + FT_EXPORT( FT_Error ) FT_Glyph_Copy( FT_Glyph source, + FT_Glyph* target ); /*************************************************************************/ @@ -211,9 +211,9 @@ /* The 2x2 transformation matrix is also applied to the glyph's */ /* advance vector. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Glyph_Transform( FT_Glyph glyph, - FT_Matrix* matrix, - FT_Vector* delta ); + FT_EXPORT( FT_Error ) FT_Glyph_Transform( FT_Glyph glyph, + FT_Matrix* matrix, + FT_Vector* delta ); enum @@ -279,9 +279,9 @@ /* */ /* The default value for `bbox_mode' is `ft_glyph_bbox_pixels'. */ /* */ - FT_EXPORT_DEF( void ) FT_Glyph_Get_CBox( FT_Glyph glyph, - FT_UInt bbox_mode, - FT_BBox* cbox ); + FT_EXPORT( void ) FT_Glyph_Get_CBox( FT_Glyph glyph, + FT_UInt bbox_mode, + FT_BBox* cbox ); /*************************************************************************/ @@ -355,10 +355,10 @@ /* This function will always fail if the glyph's format isn't */ /* scalable. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Glyph_To_Bitmap( FT_Glyph* the_glyph, - FT_ULong render_mode, - FT_Vector* origin, - FT_Bool destroy ); + FT_EXPORT( FT_Error ) FT_Glyph_To_Bitmap( FT_Glyph* the_glyph, + FT_ULong render_mode, + FT_Vector* origin, + FT_Bool destroy ); /*************************************************************************/ @@ -372,7 +372,7 @@ /* <Input> */ /* glyph :: A handle to the target glyph object. */ /* */ - FT_EXPORT_DEF( void ) FT_Done_Glyph( FT_Glyph glyph ); + FT_EXPORT( void ) FT_Done_Glyph( FT_Glyph glyph ); /* other helpful functions */ @@ -398,8 +398,8 @@ /* <Note> */ /* The result is undefined if either `a' or `b' is zero. */ /* */ - FT_EXPORT_DEF( void ) FT_Matrix_Multiply( FT_Matrix* a, - FT_Matrix* b ); + FT_EXPORT( void ) FT_Matrix_Multiply( FT_Matrix* a, + FT_Matrix* b ); /*************************************************************************/ @@ -420,7 +420,7 @@ /* <MT-Note> */ /* Yes. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Matrix_Invert( FT_Matrix* matrix ); + FT_EXPORT( FT_Error ) FT_Matrix_Invert( FT_Matrix* matrix ); #ifdef __cplusplus diff --git a/include/freetype/ftlist.h b/include/freetype/ftlist.h index 7c6d8ed3b..5b898be5d 100644 --- a/include/freetype/ftlist.h +++ b/include/freetype/ftlist.h @@ -34,20 +34,20 @@ #endif - FT_EXPORT_DEF( FT_ListNode ) FT_List_Find( FT_List list, - void* data ); + FT_EXPORT( FT_ListNode ) FT_List_Find( FT_List list, + void* data ); - FT_EXPORT_DEF( void ) FT_List_Add( FT_List list, - FT_ListNode node ); + FT_EXPORT( void ) FT_List_Add ( FT_List list, + FT_ListNode node ); - FT_EXPORT_DEF( void ) FT_List_Insert( FT_List list, - FT_ListNode node ); + FT_EXPORT( void ) FT_List_Insert ( FT_List list, + FT_ListNode node ); - FT_EXPORT_DEF( void ) FT_List_Remove( FT_List list, - FT_ListNode node ); + FT_EXPORT( void ) FT_List_Remove ( FT_List list, + FT_ListNode node ); - FT_EXPORT_DEF( void ) FT_List_Up( FT_List list, - FT_ListNode node ); + FT_EXPORT( void ) FT_List_Up ( FT_List list, + FT_ListNode node ); /*************************************************************************/ @@ -69,9 +69,9 @@ void* user ); - FT_EXPORT_DEF( FT_Error ) FT_List_Iterate( FT_List list, - FT_List_Iterator iterator, - void* user ); + FT_EXPORT( FT_Error ) FT_List_Iterate( FT_List list, + FT_List_Iterator iterator, + void* user ); /*************************************************************************/ @@ -97,10 +97,10 @@ void* user ); - FT_EXPORT_DEF( void ) FT_List_Finalize( FT_List list, - FT_List_Destructor destroy, - FT_Memory memory, - void* user ); + FT_EXPORT( void ) FT_List_Finalize( FT_List list, + FT_List_Destructor destroy, + FT_Memory memory, + void* user ); #ifdef __cplusplus diff --git a/include/freetype/ftmac.h b/include/freetype/ftmac.h index 13aa640a2..1f3570009 100644 --- a/include/freetype/ftmac.h +++ b/include/freetype/ftmac.h @@ -59,7 +59,7 @@ /* fond = GetResource( 'FOND', fontName ); */ /* error = FT_New_Face_From_FOND( library, fond, 0, &face ); */ /* */ - FT_EXPORT_FUNC( FT_Error ) FT_New_Face_From_FOND( + FT_EXPORT_DEF( FT_Error ) FT_New_Face_From_FOND( FT_Library library, Handle fond, FT_Long face_index, diff --git a/include/freetype/ftmm.h b/include/freetype/ftmm.h index db5db0464..e14c1743b 100644 --- a/include/freetype/ftmm.h +++ b/include/freetype/ftmm.h @@ -108,8 +108,8 @@ /* <Return> */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Get_Multi_Master( FT_Face face, - FT_Multi_Master* master ); + FT_EXPORT( FT_Error ) FT_Get_Multi_Master( FT_Face face, + FT_Multi_Master* master ); /*************************************************************************/ @@ -132,7 +132,7 @@ /* <Return> */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Set_MM_Design_Coordinates( + FT_EXPORT( FT_Error ) FT_Set_MM_Design_Coordinates( FT_Face face, FT_UInt num_coords, FT_Long* coords ); @@ -159,7 +159,7 @@ /* <Return> */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Set_MM_Blend_Coordinates( + FT_EXPORT( FT_Error ) FT_Set_MM_Blend_Coordinates( FT_Face face, FT_UInt num_coords, FT_Fixed* coords ); diff --git a/include/freetype/ftmodule.h b/include/freetype/ftmodule.h index 3c09aa2af..f8d32519e 100644 --- a/include/freetype/ftmodule.h +++ b/include/freetype/ftmodule.h @@ -123,8 +123,8 @@ /* An error will be returned if a module already exists by that name, */ /* or if the module requires a version of FreeType that is too great. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Add_Module( FT_Library library, - const FT_Module_Class* clazz ); + FT_EXPORT( FT_Error ) FT_Add_Module( FT_Library library, + const FT_Module_Class* clazz ); /*************************************************************************/ @@ -147,8 +147,8 @@ /* You should better be familiar with FreeType internals to know */ /* which module to look for :-) */ /* */ - FT_EXPORT_DEF( FT_Module ) FT_Get_Module( FT_Library library, - const char* module_name ); + FT_EXPORT( FT_Module ) FT_Get_Module( FT_Library library, + const char* module_name ); /*************************************************************************/ @@ -170,8 +170,8 @@ /* <Note> */ /* The module object is destroyed by the function in case of success. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Remove_Module( FT_Library library, - FT_Module module ); + FT_EXPORT( FT_Error ) FT_Remove_Module( FT_Library library, + FT_Module module ); /*************************************************************************/ @@ -193,8 +193,8 @@ /* <Return> */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_New_Library( FT_Memory memory, - FT_Library* library ); + FT_EXPORT( FT_Error ) FT_New_Library( FT_Memory memory, + FT_Library* library ); /*************************************************************************/ @@ -212,7 +212,7 @@ /* <Return> */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Done_Library( FT_Library library ); + FT_EXPORT( FT_Error ) FT_Done_Library( FT_Library library ); @@ -241,9 +241,9 @@ /* Currently, four debug hook slots are available, but only two (for */ /* the TrueType and the Type 1 interpreter) are defined. */ /* */ - FT_EXPORT_DEF( void ) FT_Set_Debug_Hook( FT_Library library, - FT_UInt hook_index, - FT_DebugHook_Func debug_hook ); + FT_EXPORT( void ) FT_Set_Debug_Hook( FT_Library library, + FT_UInt hook_index, + FT_DebugHook_Func debug_hook ); @@ -260,7 +260,7 @@ /* <InOut> */ /* library :: A handle to a new library object. */ /* */ - FT_EXPORT_DEF( void ) FT_Add_Default_Modules( FT_Library library ); + FT_EXPORT( void ) FT_Add_Default_Modules( FT_Library library ); #ifdef __cplusplus diff --git a/include/freetype/ftnames.h b/include/freetype/ftnames.h index c29f9d8d7..21abdeec7 100644 --- a/include/freetype/ftnames.h +++ b/include/freetype/ftnames.h @@ -86,7 +86,7 @@ /* <Return> */ /* The number of strings in the `name' table. */ /* */ - FT_EXPORT_DEF( FT_UInt ) FT_Get_Sfnt_Name_Count( FT_Face face ); + FT_EXPORT( FT_UInt ) FT_Get_Sfnt_Name_Count( FT_Face face ); /*************************************************************************/ @@ -116,9 +116,9 @@ /* `name' table entries, then do a loop until you get the right */ /* platform, encoding, and name ID. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Get_Sfnt_Name( FT_Face face, - FT_UInt index, - FT_SfntName* aname ); + FT_EXPORT( FT_Error ) FT_Get_Sfnt_Name( FT_Face face, + FT_UInt index, + FT_SfntName* aname ); #ifdef __cplusplus diff --git a/include/freetype/ftoutln.h b/include/freetype/ftoutln.h index 0bf332ac0..6ba3c3979 100644 --- a/include/freetype/ftoutln.h +++ b/include/freetype/ftoutln.h @@ -52,7 +52,7 @@ /* <Return> */ /* FreeType error code. 0 means sucess. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Outline_Decompose( + FT_EXPORT( FT_Error ) FT_Outline_Decompose( FT_Outline* outline, const FT_Outline_Funcs* interface, void* user ); @@ -90,13 +90,13 @@ /* The reason why this function takes a `library' parameter is simply */ /* to use the library's memory allocator. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Outline_New( FT_Library library, - FT_UInt numPoints, - FT_Int numContours, - FT_Outline* outline ); + FT_EXPORT( FT_Error ) FT_Outline_New( FT_Library library, + FT_UInt numPoints, + FT_Int numContours, + FT_Outline* outline ); - FT_EXPORT_DEF( FT_Error ) FT_Outline_New_Internal( + FT_EXPORT( FT_Error ) FT_Outline_New_Internal( FT_Memory memory, FT_UInt numPoints, FT_Int numContours, @@ -130,12 +130,12 @@ /* The reason why this function takes an `outline' parameter is */ /* simply to use FT_Free(). */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Outline_Done( FT_Library library, - FT_Outline* outline ); + FT_EXPORT( FT_Error ) FT_Outline_Done( FT_Library library, + FT_Outline* outline ); - FT_EXPORT_DEF( FT_Error ) FT_Outline_Done_Internal( FT_Memory memory, - FT_Outline* outline ); + FT_EXPORT( FT_Error ) FT_Outline_Done_Internal( FT_Memory memory, + FT_Outline* outline ); /*************************************************************************/ @@ -164,8 +164,8 @@ /* <MT-Note> */ /* Yes. */ /* */ - FT_EXPORT_DEF( void ) FT_Outline_Get_CBox( FT_Outline* outline, - FT_BBox* cbox ); + FT_EXPORT( void ) FT_Outline_Get_CBox( FT_Outline* outline, + FT_BBox* cbox ); /*************************************************************************/ @@ -186,9 +186,9 @@ /* <MT-Note> */ /* Yes. */ /* */ - FT_EXPORT_DEF( void ) FT_Outline_Translate( FT_Outline* outline, - FT_Pos xOffset, - FT_Pos yOffset ); + FT_EXPORT( void ) FT_Outline_Translate( FT_Outline* outline, + FT_Pos xOffset, + FT_Pos yOffset ); /*************************************************************************/ @@ -210,8 +210,8 @@ /* <Return> */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Outline_Copy( FT_Outline* source, - FT_Outline* target ); + FT_EXPORT( FT_Error ) FT_Outline_Copy( FT_Outline* source, + FT_Outline* target ); /*************************************************************************/ @@ -234,8 +234,8 @@ /* <Note> */ /* The result is undefined if either `vector' or `matrix' is invalid. */ /* */ - FT_EXPORT_DEF( void ) FT_Outline_Transform( FT_Outline* outline, - FT_Matrix* matrix ); + FT_EXPORT( void ) FT_Outline_Transform( FT_Outline* outline, + FT_Matrix* matrix ); /*************************************************************************/ @@ -257,7 +257,7 @@ /* It shouldn't be used by a normal client application, unless it */ /* knows what it is doing. */ /* */ - FT_EXPORT_DEF( void ) FT_Outline_Reverse( FT_Outline* outline ); + FT_EXPORT( void ) FT_Outline_Reverse( FT_Outline* outline ); /*************************************************************************/ @@ -289,9 +289,9 @@ /* */ /* It will use the raster correponding to the default glyph format. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Outline_Get_Bitmap( FT_Library library, - FT_Outline* outline, - FT_Bitmap* bitmap ); + FT_EXPORT( FT_Error ) FT_Outline_Get_Bitmap( FT_Library library, + FT_Outline* outline, + FT_Bitmap* bitmap ); /*************************************************************************/ @@ -328,9 +328,9 @@ /* converter is called, which means that the value you give to it is */ /* actually ignored. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Outline_Render( FT_Library library, - FT_Outline* outline, - FT_Raster_Params* params ); + FT_EXPORT( FT_Error ) FT_Outline_Render( FT_Library library, + FT_Outline* outline, + FT_Raster_Params* params ); #ifdef __cplusplus diff --git a/include/freetype/ftrender.h b/include/freetype/ftrender.h index b3db90911..a92bc2bf2 100644 --- a/include/freetype/ftrender.h +++ b/include/freetype/ftrender.h @@ -144,8 +144,8 @@ /* To add a new renderer, simply use FT_Add_Module(). To retrieve a */ /* renderer by its name, use FT_Get_Module(). */ /* */ - FT_EXPORT_DEF( FT_Renderer ) FT_Get_Renderer( FT_Library library, - FT_Glyph_Format format ); + FT_EXPORT( FT_Renderer ) FT_Get_Renderer( FT_Library library, + FT_Glyph_Format format ); /*************************************************************************/ @@ -174,10 +174,10 @@ /* */ /* This doesn't change the current renderer for other formats. */ /* */ - FT_EXPORT_DEF( FT_Error ) FT_Set_Renderer( FT_Library library, - FT_Renderer renderer, - FT_UInt num_params, - FT_Parameter* parameters ); + FT_EXPORT( FT_Error ) FT_Set_Renderer( FT_Library library, + FT_Renderer renderer, + FT_UInt num_params, + FT_Parameter* parameters ); #ifdef __cplusplus diff --git a/include/freetype/ftsynth.h b/include/freetype/ftsynth.h index af7a62ebf..8952969ac 100644 --- a/include/freetype/ftsynth.h +++ b/include/freetype/ftsynth.h @@ -48,13 +48,13 @@ /* This code is completely experimental -- use with care! */ /* It will probably be completely rewritten in the future */ /* or even integrated into the library. */ - FT_EXPORT_DEF( FT_Error ) FT_Outline_Embolden( FT_GlyphSlot original, - FT_Outline* outline, - FT_Pos* advance ); + FT_EXPORT( FT_Error ) FT_Outline_Embolden( FT_GlyphSlot original, + FT_Outline* outline, + FT_Pos* advance ); - FT_EXPORT_DEF( FT_Error ) FT_Outline_Oblique( FT_GlyphSlot original, - FT_Outline* outline, - FT_Pos* advance ); + FT_EXPORT( FT_Error ) FT_Outline_Oblique( FT_GlyphSlot original, + FT_Outline* outline, + FT_Pos* advance ); #ifdef __cplusplus diff --git a/include/freetype/internal/ftcalc.h b/include/freetype/internal/ftcalc.h index bfba538ab..382c33851 100644 --- a/include/freetype/internal/ftcalc.h +++ b/include/freetype/internal/ftcalc.h @@ -40,7 +40,7 @@ #define SQRT_64( z ) FT_Sqrt64( z ) - FT_EXPORT_DEF( FT_Int32 ) FT_Sqrt64( FT_Int64 l ); + FT_EXPORT( FT_Int32 ) FT_Sqrt64( FT_Int64 l ); #endif /* FT_CONFIG_OPTION_OLD_CALCS */ @@ -60,25 +60,25 @@ #define MUL_64( x, y, z ) FT_MulTo64( x, y, &z ) #define DIV_64( x, y ) FT_Div64by32( &x, y ) - FT_EXPORT_DEF( void ) FT_Add64( FT_Int64* x, - FT_Int64* y, - FT_Int64* z ); + FT_EXPORT( void ) FT_Add64( FT_Int64* x, + FT_Int64* y, + FT_Int64* z ); - FT_EXPORT_DEF( void ) FT_MulTo64( FT_Int32 x, - FT_Int32 y, - FT_Int64* z ); + FT_EXPORT( void ) FT_MulTo64( FT_Int32 x, + FT_Int32 y, + FT_Int64* z ); - FT_EXPORT_DEF( FT_Int32 ) FT_Div64by32( FT_Int64* x, - FT_Int32 y ); + FT_EXPORT( FT_Int32 ) FT_Div64by32( FT_Int64* x, + FT_Int32 y ); #ifdef FT_CONFIG_OPTION_OLD_CALCS - FT_EXPORT_DEF( FT_Int32 ) FT_SqrtFixed( FT_Int32 x ); + FT_EXPORT( FT_Int32 ) FT_SqrtFixed( FT_Int32 x ); #define SQRT_64( z ) FT_Sqrt64( &z ) - FT_EXPORT_DEF( FT_Int32 ) FT_Sqrt64( FT_Int64* x ); + FT_EXPORT( FT_Int32 ) FT_Sqrt64( FT_Int64* x ); #endif /* FT_CONFIG_OPTION_OLD_CALCS */ @@ -90,7 +90,7 @@ #define SQRT_32( x ) FT_Sqrt32( x ) - BASE_DEF( FT_Int32 ) FT_Sqrt32( FT_Int32 x ); + FT_BASE( FT_Int32 ) FT_Sqrt32( FT_Int32 x ); #endif /* !FT_CONFIG_OPTION_OLD_CALCS */ diff --git a/include/freetype/internal/ftdebug.h b/include/freetype/internal/ftdebug.h index 9cfba8f71..b47101df3 100644 --- a/include/freetype/internal/ftdebug.h +++ b/include/freetype/internal/ftdebug.h @@ -138,8 +138,8 @@ } while ( 0 ) - FT_EXPORT_DEF( void ) FT_SetTraceLevel( FT_Trace component, - char level ); + FT_EXPORT( void ) FT_SetTraceLevel( FT_Trace component, + char level ); #elif defined( FT_DEBUG_LEVEL_ERROR ) @@ -185,10 +185,10 @@ } while ( 0 ) /* print a message */ - FT_EXPORT_DEF( void ) FT_Message( const char* fmt, ... ); + FT_EXPORT( void ) FT_Message( const char* fmt, ... ); /* print a message and exit */ - FT_EXPORT_DEF( void ) FT_Panic( const char* fmt, ... ); + FT_EXPORT( void ) FT_Panic( const char* fmt, ... ); #define FT_ERROR( varformat ) FT_XCAT( FT_Message, varformat ) diff --git a/include/freetype/internal/ftextend.h b/include/freetype/internal/ftextend.h index fdd2c6ef2..39bb98b6c 100644 --- a/include/freetype/internal/ftextend.h +++ b/include/freetype/internal/ftextend.h @@ -130,7 +130,7 @@ } FT_Extension_Class; - FT_EXPORT_DEF( FT_Error ) FT_Register_Extension( + FT_EXPORT( FT_Error ) FT_Register_Extension( FT_Driver driver, FT_Extension_Class* clazz ); @@ -139,21 +139,21 @@ /* Initialize the extension component */ - LOCAL_DEF + FT_LOCAL FT_Error FT_Init_Extensions( FT_Library library ); /* Finalize the extension component */ - LOCAL_DEF + FT_LOCAL FT_Error FT_Done_Extensions( FT_Library library ); /* Create an extension within a face object. Called by the */ /* face object constructor. */ - LOCAL_DEF + FT_LOCAL FT_Error FT_Create_Extensions( FT_Face face ); /* Destroy all extensions within a face object. Called by the */ /* face object destructor. */ - LOCAL_DEF + FT_LOCAL FT_Error FT_Destroy_Extensions( FT_Face face ); @@ -161,7 +161,7 @@ /* return an extension's data & interface according to its ID */ - FT_EXPORT_DEF( void* ) FT_Get_Extension( + FT_EXPORT( void* ) FT_Get_Extension( FT_Face face, const char* extension_id, void** extension_interface ); diff --git a/include/freetype/internal/ftmemory.h b/include/freetype/internal/ftmemory.h index 48403ecb1..7997b24d9 100644 --- a/include/freetype/internal/ftmemory.h +++ b/include/freetype/internal/ftmemory.h @@ -56,17 +56,17 @@ /*************************************************************************/ /*************************************************************************/ - BASE_DEF( FT_Error ) FT_Alloc( FT_Memory memory, - FT_Long size, - void** P ); + FT_BASE( FT_Error ) FT_Alloc( FT_Memory memory, + FT_Long size, + void** P ); - BASE_DEF( FT_Error ) FT_Realloc( FT_Memory memory, - FT_Long current, - FT_Long size, - void** P ); + FT_BASE( FT_Error ) FT_Realloc( FT_Memory memory, + FT_Long current, + FT_Long size, + void** P ); - BASE_DEF( void ) FT_Free( FT_Memory memory, - void** P ); + FT_BASE( void ) FT_Free( FT_Memory memory, + void** P ); diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h index f6bc4d5ce..c911ca49d 100644 --- a/include/freetype/internal/ftobjs.h +++ b/include/freetype/internal/ftobjs.h @@ -165,8 +165,8 @@ /* You should better be familiar with FreeType internals to know */ /* which module to look for, and what its interface is :-) */ /* */ - BASE_DEF( const void* ) FT_Get_Module_Interface( FT_Library library, - const char* mod_name ); + FT_BASE( const void* ) FT_Get_Module_Interface( FT_Library library, + const char* mod_name ); /*************************************************************************/ @@ -201,17 +201,17 @@ /* this must be kept exported -- tt will be used later in our own */ /* high-level caching font manager called SemTex (way after the */ /* 2.0 release though */ - FT_EXPORT_DEF( FT_Error ) FT_New_Size( FT_Face face, - FT_Size* size ); + FT_EXPORT( FT_Error ) FT_New_Size( FT_Face face, + FT_Size* size ); - FT_EXPORT_DEF( FT_Error ) FT_Done_Size( FT_Size size ); + FT_EXPORT( FT_Error ) FT_Done_Size( FT_Size size ); - BASE_DEF( FT_Error ) FT_New_GlyphSlot( FT_Face face, - FT_GlyphSlot* aslot ); + FT_BASE( FT_Error ) FT_New_GlyphSlot( FT_Face face, + FT_GlyphSlot* aslot ); - BASE_DEF( void ) FT_Done_GlyphSlot( FT_GlyphSlot slot ); + FT_BASE( void ) FT_Done_GlyphSlot( FT_GlyphSlot slot ); /*************************************************************************/ @@ -278,33 +278,33 @@ }; - BASE_DEF( FT_Error ) FT_GlyphLoader_New( FT_Memory memory, - FT_GlyphLoader** aloader ); + FT_BASE( FT_Error ) FT_GlyphLoader_New( FT_Memory memory, + FT_GlyphLoader** aloader ); - BASE_DEF( FT_Error ) FT_GlyphLoader_Create_Extra( - FT_GlyphLoader* loader ); + FT_BASE( FT_Error ) FT_GlyphLoader_Create_Extra( + FT_GlyphLoader* loader ); - BASE_DEF( void ) FT_GlyphLoader_Done( FT_GlyphLoader* loader ); + FT_BASE( void ) FT_GlyphLoader_Done( FT_GlyphLoader* loader ); - BASE_DEF( void ) FT_GlyphLoader_Reset( FT_GlyphLoader* loader ); + FT_BASE( void ) FT_GlyphLoader_Reset( FT_GlyphLoader* loader ); - BASE_DEF( void ) FT_GlyphLoader_Rewind( FT_GlyphLoader* loader ); + FT_BASE( void ) FT_GlyphLoader_Rewind( FT_GlyphLoader* loader ); - BASE_DEF( FT_Error ) FT_GlyphLoader_Check_Points( + FT_BASE( FT_Error ) FT_GlyphLoader_Check_Points( FT_GlyphLoader* loader, FT_UInt n_points, FT_UInt n_contours ); - BASE_DEF( FT_Error ) FT_GlyphLoader_Check_Subglyphs( + FT_BASE( FT_Error ) FT_GlyphLoader_Check_Subglyphs( FT_GlyphLoader* loader, FT_UInt n_subs ); - BASE_DEF( void ) FT_GlyphLoader_Prepare( FT_GlyphLoader* loader ); + FT_BASE( void ) FT_GlyphLoader_Prepare( FT_GlyphLoader* loader ); - BASE_DEF( void ) FT_GlyphLoader_Add( FT_GlyphLoader* loader ); + FT_BASE( void ) FT_GlyphLoader_Add( FT_GlyphLoader* loader ); - BASE_DEF( FT_Error ) FT_GlyphLoader_Copy_Points( FT_GlyphLoader* target, - FT_GlyphLoader* source ); + FT_BASE( FT_Error ) FT_GlyphLoader_Copy_Points( FT_GlyphLoader* target, + FT_GlyphLoader* source ); /*************************************************************************/ @@ -483,11 +483,11 @@ } FT_LibraryRec; - BASE_DEF( FT_Renderer ) FT_Lookup_Renderer( FT_Library library, + FT_BASE( FT_Renderer ) FT_Lookup_Renderer( FT_Library library, FT_Glyph_Format format, FT_ListNode* node ); - BASE_DEF( FT_Error ) FT_Render_Glyph_Internal( FT_Library library, + FT_BASE( FT_Error ) FT_Render_Glyph_Internal( FT_Library library, FT_GlyphSlot slot, FT_UInt render_mode ); @@ -499,14 +499,14 @@ #ifndef FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM - FT_EXPORT_DEF( FT_Error ) FT_New_Stream( const char* filepathname, - FT_Stream astream ); + FT_EXPORT( FT_Error ) FT_New_Stream( const char* filepathname, + FT_Stream astream ); - FT_EXPORT_DEF( void ) FT_Done_Stream( FT_Stream stream ); + FT_EXPORT( void ) FT_Done_Stream( FT_Stream stream ); - FT_EXPORT_DEF( FT_Memory ) FT_New_Memory( void ); + FT_EXPORT( FT_Memory ) FT_New_Memory( void ); - FT_EXPORT_DEF( void ) FT_Done_Memory( FT_Memory memory ); + FT_EXPORT( void ) FT_Done_Memory( FT_Memory memory ); #endif /* !FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM */ diff --git a/include/freetype/internal/ftstream.h b/include/freetype/internal/ftstream.h index cc273efb0..87dcacffa 100644 --- a/include/freetype/internal/ftstream.h +++ b/include/freetype/internal/ftstream.h @@ -243,75 +243,75 @@ #define READ_ULongLE( var ) FT_READ_MACRO( FT_Read_LongLE, FT_ULong, var ) - BASE_DEF( void ) FT_New_Memory_Stream( FT_Library library, - FT_Byte* base, - FT_ULong size, - FT_Stream stream ); + FT_BASE( void ) FT_New_Memory_Stream( FT_Library library, + FT_Byte* base, + FT_ULong size, + FT_Stream stream ); - BASE_DEF( FT_Error ) FT_Seek_Stream( FT_Stream stream, - FT_ULong pos ); + FT_BASE( FT_Error ) FT_Seek_Stream( FT_Stream stream, + FT_ULong pos ); - BASE_DEF( FT_Error ) FT_Skip_Stream( FT_Stream stream, - FT_Long distance ); + FT_BASE( FT_Error ) FT_Skip_Stream( FT_Stream stream, + FT_Long distance ); - BASE_DEF( FT_Long ) FT_Stream_Pos( FT_Stream stream ); + FT_BASE( FT_Long ) FT_Stream_Pos( FT_Stream stream ); - BASE_DEF( FT_Error ) FT_Read_Stream( FT_Stream stream, + FT_BASE( FT_Error ) FT_Read_Stream( FT_Stream stream, FT_Byte* buffer, FT_ULong count ); - BASE_DEF( FT_Error ) FT_Read_Stream_At( FT_Stream stream, - FT_ULong pos, - FT_Byte* buffer, - FT_ULong count ); + FT_BASE( FT_Error ) FT_Read_Stream_At( FT_Stream stream, + FT_ULong pos, + FT_Byte* buffer, + FT_ULong count ); - BASE_DEF( FT_Error ) FT_Access_Frame( FT_Stream stream, - FT_ULong count ); + FT_BASE( FT_Error ) FT_Access_Frame( FT_Stream stream, + FT_ULong count ); - BASE_DEF( void ) FT_Forget_Frame( FT_Stream stream ); + FT_BASE( void ) FT_Forget_Frame( FT_Stream stream ); - BASE_DEF( FT_Error ) FT_Extract_Frame( FT_Stream stream, - FT_ULong count, - FT_Byte** pbytes ); + FT_BASE( FT_Error ) FT_Extract_Frame( FT_Stream stream, + FT_ULong count, + FT_Byte** pbytes ); - BASE_DEF( void ) FT_Release_Frame( FT_Stream stream, - FT_Byte** pbytes ); + FT_BASE( void ) FT_Release_Frame( FT_Stream stream, + FT_Byte** pbytes ); - BASE_DEF( FT_Char ) FT_Get_Char( FT_Stream stream ); + FT_BASE( FT_Char ) FT_Get_Char( FT_Stream stream ); - BASE_DEF( FT_Short ) FT_Get_Short( FT_Stream stream ); + FT_BASE( FT_Short ) FT_Get_Short( FT_Stream stream ); - BASE_DEF( FT_Long ) FT_Get_Offset( FT_Stream stream ); + FT_BASE( FT_Long ) FT_Get_Offset( FT_Stream stream ); - BASE_DEF( FT_Long ) FT_Get_Long( FT_Stream stream ); + FT_BASE( FT_Long ) FT_Get_Long( FT_Stream stream ); - BASE_DEF( FT_Short ) FT_Get_ShortLE( FT_Stream stream ); + FT_BASE( FT_Short ) FT_Get_ShortLE( FT_Stream stream ); - BASE_DEF( FT_Long ) FT_Get_LongLE( FT_Stream stream ); + FT_BASE( FT_Long ) FT_Get_LongLE( FT_Stream stream ); - BASE_DEF( FT_Char ) FT_Read_Char( FT_Stream stream, - FT_Error* error ); + FT_BASE( FT_Char ) FT_Read_Char( FT_Stream stream, + FT_Error* error ); - BASE_DEF( FT_Short ) FT_Read_Short( FT_Stream stream, - FT_Error* error ); + FT_BASE( FT_Short ) FT_Read_Short( FT_Stream stream, + FT_Error* error ); - BASE_DEF( FT_Long ) FT_Read_Offset( FT_Stream stream, + FT_BASE( FT_Long ) FT_Read_Offset( FT_Stream stream, FT_Error* error ); - BASE_DEF( FT_Long ) FT_Read_Long( FT_Stream stream, + FT_BASE( FT_Long ) FT_Read_Long( FT_Stream stream, FT_Error* error ); - BASE_DEF( FT_Short ) FT_Read_ShortLE( FT_Stream stream, + FT_BASE( FT_Short ) FT_Read_ShortLE( FT_Stream stream, FT_Error* error ); - BASE_DEF( FT_Long ) FT_Read_LongLE( FT_Stream stream, + FT_BASE( FT_Long ) FT_Read_LongLE( FT_Stream stream, FT_Error* error ); - BASE_DEF( FT_Error ) FT_Read_Fields( FT_Stream stream, - const FT_Frame_Field* fields, - void* structure ); + FT_BASE( FT_Error ) FT_Read_Fields( FT_Stream stream, + const FT_Frame_Field* fields, + void* structure ); #define USE_Stream( resource, stream ) \ diff --git a/include/freetype/tttables.h b/include/freetype/tttables.h index 99b6c63a3..1bcb1e0e8 100644 --- a/include/freetype/tttables.h +++ b/include/freetype/tttables.h @@ -569,8 +569,8 @@ /* You can load any table using the (internal) SFNT_Interface */ /* structure -- this is available via FT_Get_Module_Interface(). */ /* */ - FT_EXPORT_DEF( void* ) FT_Get_Sfnt_Table( FT_Face face, - FT_Sfnt_Tag tag ); + FT_EXPORT( void* ) FT_Get_Sfnt_Table( FT_Face face, + FT_Sfnt_Tag tag ); #ifdef __cplusplus |