From dc72aff43d036b7f3fb3a448eece15c95353b4e6 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 4 Nov 2000 08:33:38 +0000 Subject: [PATCH] Finishing David's latest changes (there were some errors in it). --- .../cygwin/devel/freetype/config/ftoption.h | 14 +- builds/cygwin/ftsystem.c | 2 +- builds/dos/dos-gcc.mk | 2 +- builds/unix/devel/freetype/config/ftoption.h | 14 +- builds/unix/ftconfig.in | 79 +++++---- builds/unix/ftsystem.c | 2 +- builds/win32/devel/freetype/config/ftoption.h | 14 +- include/freetype/cache/ftcglyph.h | 10 +- include/freetype/config/ftconfig.h | 14 +- include/freetype/freetype.h | 155 ++++++++---------- include/freetype/ftcache.h | 6 +- include/freetype/ftmac.h | 18 +- include/freetype/ftmm.h | 12 +- include/freetype/ftoutln.h | 14 +- include/freetype/internal/ftextend.h | 12 +- include/freetype/internal/ftobjs.h | 94 ++++++----- include/freetype/internal/ftstream.h | 4 +- src/autohint/ahmodule.h | 3 +- src/base/ftextend.c | 11 +- src/base/ftglyph.c | 4 +- src/base/ftmm.c | 12 +- src/base/ftobjs.c | 46 +++--- src/base/ftoutln.c | 20 +-- src/base/ftstream.c | 2 +- src/base/ftsynth.c | 6 +- src/cache/ftcchunk.c | 8 +- src/cache/ftcglyph.c | 6 +- src/cache/ftcmanag.c | 6 +- src/cff/t2driver.h | 3 +- src/psaux/psobjs.c | 2 +- src/psaux/t1decode.h | 3 +- src/sfnt/ttcmap.c | 20 ++- src/smooth/ftgrays.h | 2 +- src/truetype/ttobjs.h | 12 +- src/type1/t1gload.c | 10 +- 35 files changed, 331 insertions(+), 311 deletions(-) diff --git a/builds/cygwin/devel/freetype/config/ftoption.h b/builds/cygwin/devel/freetype/config/ftoption.h index 131d3659b..644c14322 100644 --- a/builds/cygwin/devel/freetype/config/ftoption.h +++ b/builds/cygwin/devel/freetype/config/ftoption.h @@ -155,29 +155,29 @@ /* declarations. */ /* */ /* Two macros are used within the FreeType source code to define */ - /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */ + /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */ /* */ - /* FT_EXPORT( return_type ) */ + /* FT_EXPORT( return_type ) */ /* */ /* is used in a function declaration, as in */ /* */ - /* FT_EXPORT( FT_Error ) */ + /* FT_EXPORT( FT_Error ) */ /* FT_Init_FreeType( FT_Library* alibrary ); */ /* */ /* */ - /* FT_EXPORT_DEF( return_type ) */ + /* FT_EXPORT_DEF( return_type ) */ /* */ /* is used in a function definition, as in */ /* */ - /* FT_EXPORT_DEF( 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 and */ - /* FT_EXPORT_DEF 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. */ /* */ diff --git a/builds/cygwin/ftsystem.c b/builds/cygwin/ftsystem.c index 7e7f52bdb..f365c95e4 100644 --- a/builds/cygwin/ftsystem.c +++ b/builds/cygwin/ftsystem.c @@ -219,7 +219,7 @@ /* FreeType error code. 0 means success. */ /* */ FT_EXPORT_DEF( FT_Error ) FT_New_Stream( const char* filepathname, - FT_Stream stream ) + FT_Stream stream ) { int file; struct stat stat_buf; diff --git a/builds/dos/dos-gcc.mk b/builds/dos/dos-gcc.mk index 7670078f6..50bfa3b9a 100644 --- a/builds/dos/dos-gcc.mk +++ b/builds/dos/dos-gcc.mk @@ -15,8 +15,8 @@ SEP := / CLEAN_LIBRARY := $(DELETE) $@ + include $(TOP)/builds/compiler/gcc.mk include $(TOP)/builds/dos/dos-def.mk # EOF - diff --git a/builds/unix/devel/freetype/config/ftoption.h b/builds/unix/devel/freetype/config/ftoption.h index 131d3659b..644c14322 100644 --- a/builds/unix/devel/freetype/config/ftoption.h +++ b/builds/unix/devel/freetype/config/ftoption.h @@ -155,29 +155,29 @@ /* declarations. */ /* */ /* Two macros are used within the FreeType source code to define */ - /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */ + /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */ /* */ - /* FT_EXPORT( return_type ) */ + /* FT_EXPORT( return_type ) */ /* */ /* is used in a function declaration, as in */ /* */ - /* FT_EXPORT( FT_Error ) */ + /* FT_EXPORT( FT_Error ) */ /* FT_Init_FreeType( FT_Library* alibrary ); */ /* */ /* */ - /* FT_EXPORT_DEF( return_type ) */ + /* FT_EXPORT_DEF( return_type ) */ /* */ /* is used in a function definition, as in */ /* */ - /* FT_EXPORT_DEF( 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 and */ - /* FT_EXPORT_DEF 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. */ /* */ diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in index e9c567fc7..e5c508747 100644 --- a/builds/unix/ftconfig.in +++ b/builds/unix/ftconfig.in @@ -145,42 +145,53 @@ #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 + +#ifdef __cplusplus +#define FT_EXPORT( x ) extern "C" x +#else +#define FT_EXPORT( x ) extern x +#endif + +#endif /* !FT_EXPORT */ #ifndef FT_EXPORT_DEF @@ -194,17 +205,6 @@ #endif /* !FT_EXPORT_DEF */ -#ifndef FT_EXPORT_FUNC - -#ifdef __cplusplus -#define FT_EXPORT_FUNC( x ) extern "C" x -#else -#define FT_EXPORT_FUNC( x ) extern x -#endif - -#endif /* !FT_EXPORT_FUNC */ - - #ifndef FT_EXPORT_VAR #ifdef __cplusplus @@ -215,6 +215,10 @@ #endif /* !FT_EXPORT_VAR */ + /* The following macros are needed to compile the library with a */ + /* C++ compiler. Note that we do this for convenience -- please */ + /* don't ask for more C++ features. */ + /* */ /* This is special. Within C++, you must specify `extern "C"' for */ /* functions which are used via function pointers, and you also */ @@ -222,21 +226,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/builds/unix/ftsystem.c b/builds/unix/ftsystem.c index 7e7f52bdb..f365c95e4 100644 --- a/builds/unix/ftsystem.c +++ b/builds/unix/ftsystem.c @@ -219,7 +219,7 @@ /* FreeType error code. 0 means success. */ /* */ FT_EXPORT_DEF( FT_Error ) FT_New_Stream( const char* filepathname, - FT_Stream stream ) + FT_Stream stream ) { int file; struct stat stat_buf; diff --git a/builds/win32/devel/freetype/config/ftoption.h b/builds/win32/devel/freetype/config/ftoption.h index c90db5b88..8a967aec9 100644 --- a/builds/win32/devel/freetype/config/ftoption.h +++ b/builds/win32/devel/freetype/config/ftoption.h @@ -155,29 +155,29 @@ /* declarations. */ /* */ /* Two macros are used within the FreeType source code to define */ - /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */ + /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */ /* */ - /* FT_EXPORT( return_type ) */ + /* FT_EXPORT( return_type ) */ /* */ /* is used in a function declaration, as in */ /* */ - /* FT_EXPORT( FT_Error ) */ + /* FT_EXPORT( FT_Error ) */ /* FT_Init_FreeType( FT_Library* alibrary ); */ /* */ /* */ - /* FT_EXPORT_DEF( return_type ) */ + /* FT_EXPORT_DEF( return_type ) */ /* */ /* is used in a function definition, as in */ /* */ - /* FT_EXPORT_DEF( 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 and */ - /* FT_EXPORT_DEF 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. */ /* */ diff --git a/include/freetype/cache/ftcglyph.h b/include/freetype/cache/ftcglyph.h index 111600612..6e2383e14 100644 --- a/include/freetype/cache/ftcglyph.h +++ b/include/freetype/cache/ftcglyph.h @@ -169,8 +169,8 @@ /* */ FT_EXPORT_DEF( void ) FTC_GlyphNode_Init( FTC_GlyphNode node, - FTC_GlyphSet gset, - FT_UInt gindex ); + FTC_GlyphSet gset, + FT_UInt gindex ); #define FTC_GlyphNode_Ref( n ) \ FTC_CACHENODE_TO_DATA_P( &(n)->root )->ref_count++ @@ -192,9 +192,9 @@ FTC_GlyphSet* aset ); FT_EXPORT( FT_Error ) FTC_GlyphSet_Lookup_Node( - FTC_GlyphSet gset, - FT_UInt glyph_index, - FTC_GlyphNode* anode ); + FTC_GlyphSet gset, + FT_UInt glyph_index, + FTC_GlyphNode* anode ); #ifdef __cplusplus diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h index 9fe7f5d09..71a081adb 100644 --- a/include/freetype/config/ftconfig.h +++ b/include/freetype/config/ftconfig.h @@ -229,9 +229,9 @@ #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 */ + /* The following macros are needed to compile the library with a */ + /* C++ compiler. Note that we do this for convenience -- please */ + /* don't ask for more C++ features. */ /* */ /* This is special. Within C++, you must specify `extern "C"' for */ @@ -241,13 +241,13 @@ /* functions which are accessed by (global) function pointers. */ /* */ /* */ - /* FT_CALLBACK_DEF is used to _define_ a callback function */ + /* 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 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 */ + /* that contains pointers to callback functions. */ /* */ #ifdef __cplusplus diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 1cb51091c..cae2fa3c2 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -393,20 +393,21 @@ /*************************************************************************/ /*************************************************************************/ - /********************************************************************* - * - * - * FT_Face_Internal - * - * - * an opaque handle to a FT_Face_InternalRec structure, used to - * model private data of a given FT_Face object. - * - * this fields might change between releases of FreeType 2 and - * are not generally available to client applications - * - */ - typedef struct FT_Face_InternalRec_* FT_Face_Internal; + + /*************************************************************************/ + /* */ + /* */ + /* FT_Face_Internal */ + /* */ + /* */ + /* An opaque handle to an FT_Face_InternalRec structure, used to */ + /* model private data of a given FT_Face object. */ + /* */ + /* This field might change between releases of FreeType 2 and are */ + /* not generally available to client applications. */ + /* */ + typedef struct FT_Face_InternalRec_* FT_Face_Internal; + /*************************************************************************/ /* */ @@ -571,76 +572,62 @@ /* */ /* sizes_list :: The list of child sizes for this face. */ /* */ - /* max_points :: The maximal number of points used to store */ - /* the vectorial outline of any glyph in this */ - /* face. If this value cannot be known in */ - /* advance, or if the face isn't scalable, */ - /* this should be set to 0. Only relevant for */ - /* scalable formats. */ - /* */ - /* max_contours :: The maximal number of contours used to */ - /* store the vectorial outline of any glyph in */ - /* this face. If this value cannot be known */ - /* in advance, or if the face isn't scalable, */ - /* this should be set to 0. Only relevant for */ - /* scalable formats. */ - /* */ - /* internal :: a pointer to internal fields of the face */ - /* object. These fields can change freely */ + /* internal :: A pointer to internal fields of the face */ + /* object. These fields can change freely */ /* between releases of FreeType and are not */ - /* publicly available.. */ + /* publicly available. */ /* */ typedef struct FT_FaceRec_ { - FT_Long num_faces; - FT_Long face_index; + FT_Long num_faces; + FT_Long face_index; - FT_Long face_flags; - FT_Long style_flags; + FT_Long face_flags; + FT_Long style_flags; - FT_Long num_glyphs; + FT_Long num_glyphs; - FT_String* family_name; - FT_String* style_name; + FT_String* family_name; + FT_String* style_name; - FT_Int num_fixed_sizes; - FT_Bitmap_Size* available_sizes; + FT_Int num_fixed_sizes; + FT_Bitmap_Size* available_sizes; - FT_Int num_charmaps; - FT_CharMap* charmaps; + FT_Int num_charmaps; + FT_CharMap* charmaps; - FT_Generic generic; + FT_Generic generic; - /*# the following are only relevant for scalable outlines */ - FT_BBox bbox; + /*# the following are only relevant to scalable outlines */ + FT_BBox bbox; - FT_UShort units_per_EM; - FT_Short ascender; - FT_Short descender; - FT_Short height; + FT_UShort units_per_EM; + FT_Short ascender; + FT_Short descender; + FT_Short height; - FT_Short max_advance_width; - FT_Short max_advance_height; + FT_Short max_advance_width; + FT_Short max_advance_height; - FT_Short underline_position; - FT_Short underline_thickness; + FT_Short underline_position; + FT_Short underline_thickness; - FT_GlyphSlot glyph; - FT_Size size; - FT_CharMap charmap; + FT_GlyphSlot glyph; + FT_Size size; + FT_CharMap charmap; /*@private begin */ - FT_Driver driver; - FT_Memory memory; - FT_Stream stream; + FT_Driver driver; + FT_Memory memory; + FT_Stream stream; - FT_ListRec sizes_list; + FT_ListRec sizes_list; - FT_Generic autohint; - void* extensions; + FT_Generic autohint; + void* extensions; - FT_Face_Internal internal; + FT_Face_Internal internal; /*@private end */ @@ -850,16 +837,17 @@ #define FT_STYLE_FLAG_BOLD 2 - /********************************************************************* - * - * - * FT_Size_Internal - * - * - * an opaque handle to a FT_Size_InternalRec structure, used to - * model private data of a given FT_Size object. - */ - typedef struct FT_Size_InternalRec_* FT_Size_Internal; + /*************************************************************************/ + /* */ + /* */ + /* FT_Size_Internal */ + /* */ + /* */ + /* An opaque handle to an FT_Size_InternalRec structure, used to */ + /* model private data of a given FT_Size object. */ + /* */ + typedef struct FT_Size_InternalRec_* FT_Size_Internal; + /*************************************************************************/ /* */ @@ -969,7 +957,6 @@ FT_Size_Metrics metrics; /* size metrics */ FT_Size_Internal internal; - } FT_SizeRec; @@ -989,16 +976,16 @@ typedef struct FT_SubGlyph_ FT_SubGlyph; - /********************************************************************* - * - * - * FT_Slot_Internal - * - * - * an opaque handle to a FT_Slot_InternalRec structure, used to - * model private data of a given FT_GlyphSlot object. - */ - typedef struct FT_Slot_InternalRec_* FT_Slot_Internal; + /*************************************************************************/ + /* */ + /* */ + /* FT_Slot_Internal */ + /* */ + /* */ + /* An opaque handle to an FT_Slot_InternalRec structure, used to */ + /* model private data of a given FT_GlyphSlot object. */ + /* */ + typedef struct FT_Slot_InternalRec_* FT_Slot_Internal; /*************************************************************************/ diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h index 1b26734d5..fa9529a65 100644 --- a/include/freetype/ftcache.h +++ b/include/freetype/ftcache.h @@ -321,9 +321,9 @@ /* this must be used internally for the moment */ FT_EXPORT( FT_Error ) FTC_Manager_Register_Cache( - FTC_Manager manager, - FTC_Cache_Class* clazz, - FTC_Cache* acache ); + FTC_Manager manager, + FTC_Cache_Class* clazz, + FTC_Cache* acache ); #ifdef __cplusplus diff --git a/include/freetype/ftmac.h b/include/freetype/ftmac.h index 1f3570009..466458862 100644 --- a/include/freetype/ftmac.h +++ b/include/freetype/ftmac.h @@ -16,9 +16,13 @@ /***************************************************************************/ -/* NOTE: include this file after and after the - Mac-specific header (or any other Mac header that includes - ); we use Handle type. */ +/***************************************************************************/ +/* */ +/* NOTE: Include this file after and after the */ +/* Mac-specific header (or any other Mac header that */ +/* includes ); we use Handle type. */ +/* */ +/***************************************************************************/ #ifndef FT_MAC_H @@ -60,10 +64,10 @@ /* error = FT_New_Face_From_FOND( library, fond, 0, &face ); */ /* */ FT_EXPORT_DEF( FT_Error ) FT_New_Face_From_FOND( - FT_Library library, - Handle fond, - FT_Long face_index, - FT_Face* aface ); + FT_Library library, + Handle fond, + FT_Long face_index, + FT_Face* aface ); #ifdef __cplusplus diff --git a/include/freetype/ftmm.h b/include/freetype/ftmm.h index e14c1743b..3d92c8289 100644 --- a/include/freetype/ftmm.h +++ b/include/freetype/ftmm.h @@ -133,9 +133,9 @@ /* FreeType error code. 0 means success. */ /* */ FT_EXPORT( FT_Error ) FT_Set_MM_Design_Coordinates( - FT_Face face, - FT_UInt num_coords, - FT_Long* coords ); + FT_Face face, + FT_UInt num_coords, + FT_Long* coords ); /*************************************************************************/ @@ -160,9 +160,9 @@ /* FreeType error code. 0 means success. */ /* */ FT_EXPORT( FT_Error ) FT_Set_MM_Blend_Coordinates( - FT_Face face, - FT_UInt num_coords, - FT_Fixed* coords ); + FT_Face face, + FT_UInt num_coords, + FT_Fixed* coords ); #ifdef __cplusplus diff --git a/include/freetype/ftoutln.h b/include/freetype/ftoutln.h index 6ba3c3979..2862da938 100644 --- a/include/freetype/ftoutln.h +++ b/include/freetype/ftoutln.h @@ -53,9 +53,9 @@ /* FreeType error code. 0 means sucess. */ /* */ FT_EXPORT( FT_Error ) FT_Outline_Decompose( - FT_Outline* outline, - const FT_Outline_Funcs* interface, - void* user ); + FT_Outline* outline, + const FT_Outline_Funcs* interface, + void* user ); /*************************************************************************/ @@ -97,10 +97,10 @@ FT_EXPORT( FT_Error ) FT_Outline_New_Internal( - FT_Memory memory, - FT_UInt numPoints, - FT_Int numContours, - FT_Outline* outline ); + FT_Memory memory, + FT_UInt numPoints, + FT_Int numContours, + FT_Outline* outline ); /*************************************************************************/ diff --git a/include/freetype/internal/ftextend.h b/include/freetype/internal/ftextend.h index 39bb98b6c..32045b199 100644 --- a/include/freetype/internal/ftextend.h +++ b/include/freetype/internal/ftextend.h @@ -130,9 +130,8 @@ } FT_Extension_Class; - FT_EXPORT( FT_Error ) FT_Register_Extension( - FT_Driver driver, - FT_Extension_Class* clazz ); + FT_EXPORT( FT_Error ) FT_Register_Extension( FT_Driver driver, + FT_Extension_Class* clazz ); #ifdef FT_CONFIG_OPTION_EXTEND_ENGINE @@ -161,10 +160,9 @@ /* return an extension's data & interface according to its ID */ - FT_EXPORT( void* ) FT_Get_Extension( - FT_Face face, - const char* extension_id, - void** extension_interface ); + FT_EXPORT( void* ) FT_Get_Extension( FT_Face face, + const char* extension_id, + void** extension_interface ); #ifdef __cplusplus diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h index be297c050..be9a45b0d 100644 --- a/include/freetype/internal/ftobjs.h +++ b/include/freetype/internal/ftobjs.h @@ -75,6 +75,7 @@ #define ABS( a ) ( (a) < 0 ? -(a) : (a) ) #endif + /*************************************************************************/ /* */ /* */ @@ -97,35 +98,44 @@ /* FT_Face_InternalRec */ /* */ /* */ - /* this structure contains the internal fields of each FT_Face */ - /* object. These fields may change between different releases */ - /* of FreeType. */ + /* This structure contains the internal fields of each FT_Face */ + /* object. These fields may change between different releases of */ + /* FreeType. */ /* */ /* */ - /* transform_matrix :: A 2x2 matrix of 16.16 coefficients used */ - /* to transform glyph outlines after they are */ - /* loaded from the font. Only used by the */ - /* convenience functions. */ + /* max_points :: The maximal number of points used to store the */ + /* vectorial outline of any glyph in this face. */ + /* If this value cannot be known in advance, or */ + /* if the face isn't scalable, this should be set */ + /* to 0. Only relevant for scalable formats. */ /* */ - /* transform_delta :: A translation vector used to transform */ - /* glyph outlines after they are loaded from */ - /* the font. Only used by the convenience */ - /* functions. */ + /* max_contours :: The maximal number of contours used to store */ + /* the vectorial outline of any glyph in this */ + /* face. If this value cannot be known in */ + /* advance, or if the face isn't scalable, this */ + /* should be set to 0. Only relevant for */ + /* scalable formats. */ /* */ - /* transform_flags :: Some flags used to classify the transform. */ - /* Only used by the convenience functions. */ + /* transform_matrix :: A 2x2 matrix of 16.16 coefficients used to */ + /* transform glyph outlines after they are loaded */ + /* from the font. Only used by the convenience */ + /* functions. */ /* */ + /* transform_delta :: A translation vector used to transform glyph */ + /* outlines after they are loaded from the font. */ + /* Only used by the convenience functions. */ /* */ + /* transform_flags :: Some flags used to classify the transform. */ + /* Only used by the convenience functions. */ /* */ - /* */ - typedef struct FT_Face_InternalRec_ + typedef struct FT_Face_InternalRec_ { - FT_UShort max_points; - FT_Short max_contours; + FT_UShort max_points; + FT_Short max_contours; - FT_Matrix transform_matrix; - FT_Vector transform_delta; - FT_Int transform_flags; + FT_Matrix transform_matrix; + FT_Vector transform_delta; + FT_Int transform_flags; } FT_Face_InternalRec; @@ -136,25 +146,25 @@ /* FT_Slot_InternalRec */ /* */ /* */ - /* this structure contains the internal fields of each FT_GlyphSlot */ - /* object. These fields may change between different releases */ - /* of FreeType. */ + /* This structure contains the internal fields of each FT_GlyphSlot */ + /* object. These fields may change between different releases of */ + /* FreeType. */ /* */ /* */ - /* loader :: the glyph loader object used to load */ - /* outlines in the glyph slot */ + /* loader :: The glyph loader object used to load outlines */ + /* into the glyph slot. */ /* */ - /* glyph_transformed :: boolean. set to TRUE when the loaded glyph */ + /* glyph_transformed :: Boolean. Set to TRUE when the loaded glyph */ /* must be transformed through a specific */ - /* font transform. this is _not_ the same as */ - /* the face transform set through */ - /* FT_Set_Transform */ + /* font transformation. This is _not_ the same */ + /* as the face transform set through */ + /* FT_Set_Transform(). */ /* */ - /* glyph_matrix :: the 2x2 matrix corresponding to the glyph */ - /* transform, when required */ + /* glyph_matrix :: The 2x2 matrix corresponding to the glyph */ + /* transformation, if necessary. */ /* */ - /* glyph_delta :: the 2d translation vector corresponding to */ - /* the glyph transform, when required */ + /* glyph_delta :: The 2d translation vector corresponding to */ + /* the glyph transformation, if necessary. */ /* */ typedef struct FT_Slot_InternalRec_ { @@ -380,13 +390,13 @@ FT_BASE( void ) FT_GlyphLoader_Rewind( FT_GlyphLoader* loader ); FT_BASE( FT_Error ) FT_GlyphLoader_Check_Points( - FT_GlyphLoader* loader, - FT_UInt n_points, - FT_UInt n_contours ); + FT_GlyphLoader* loader, + FT_UInt n_points, + FT_UInt n_contours ); FT_BASE( FT_Error ) FT_GlyphLoader_Check_Subglyphs( - FT_GlyphLoader* loader, - FT_UInt n_subs ); + FT_GlyphLoader* loader, + FT_UInt n_subs ); FT_BASE( void ) FT_GlyphLoader_Prepare( FT_GlyphLoader* loader ); @@ -573,12 +583,12 @@ FT_BASE( FT_Renderer ) FT_Lookup_Renderer( FT_Library library, - FT_Glyph_Format format, - FT_ListNode* node ); + FT_Glyph_Format format, + FT_ListNode* node ); FT_BASE( FT_Error ) FT_Render_Glyph_Internal( FT_Library library, - FT_GlyphSlot slot, - FT_UInt render_mode ); + FT_GlyphSlot slot, + FT_UInt render_mode ); typedef FT_Error (*FT_Glyph_Name_Requester)( FT_Face face, FT_UInt glyph_index, diff --git a/include/freetype/internal/ftstream.h b/include/freetype/internal/ftstream.h index 87dcacffa..e33147a30 100644 --- a/include/freetype/internal/ftstream.h +++ b/include/freetype/internal/ftstream.h @@ -292,7 +292,7 @@ FT_BASE( FT_Char ) FT_Read_Char( FT_Stream stream, - FT_Error* error ); + FT_Error* error ); FT_BASE( FT_Short ) FT_Read_Short( FT_Stream stream, FT_Error* error ); @@ -304,7 +304,7 @@ FT_Error* error ); FT_BASE( FT_Short ) FT_Read_ShortLE( FT_Stream stream, - FT_Error* error ); + FT_Error* error ); FT_BASE( FT_Long ) FT_Read_LongLE( FT_Stream stream, FT_Error* error ); diff --git a/src/autohint/ahmodule.h b/src/autohint/ahmodule.h index 65262e6f9..b631049d5 100644 --- a/src/autohint/ahmodule.h +++ b/src/autohint/ahmodule.h @@ -29,7 +29,8 @@ extern "C" { #endif - FT_CALLBACK_TABLE( const FT_Module_Class ) autohint_module_class; + FT_CALLBACK_TABLE + const FT_Module_Class autohint_module_class; #ifdef __cplusplus } diff --git a/src/base/ftextend.c b/src/base/ftextend.c index b99b82313..5ad457466 100644 --- a/src/base/ftextend.c +++ b/src/base/ftextend.c @@ -119,14 +119,15 @@ /* */ /* */ /* driver :: A handle to the driver object. */ + /* */ /* class :: A pointer to a class describing the extension. */ /* */ /* */ /* FreeType error code. 0 means success. */ /* */ FT_EXPORT_DEF( FT_Error ) FT_Register_Extension( - FT_Driver driver, - FT_Extension_Class* clazz ) + FT_Driver driver, + FT_Extension_Class* clazz ) { FT_Extension_Registry* registry; @@ -184,9 +185,9 @@ /* A generic pointer to the extension block. */ /* */ FT_EXPORT_DEF( void* ) FT_Get_Extension( - FT_Face face, - const char* extension_id, - void** extension_interface ) + FT_Face face, + const char* extension_id, + void** extension_interface ) { FT_Extension_Registry* registry; diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c index 5ae5d2b7c..d7f7384d0 100644 --- a/src/base/ftglyph.c +++ b/src/base/ftglyph.c @@ -424,7 +424,7 @@ /* FreeType error code. 0 means success. */ /* */ FT_EXPORT_DEF( FT_Error ) FT_Glyph_Copy( FT_Glyph source, - FT_Glyph* target ) + FT_Glyph* target ) { FT_Glyph copy; FT_Error error; @@ -761,7 +761,7 @@ FT_EXPORT_DEF( FT_Error ) FT_Glyph_To_Bitmap( FT_Glyph* the_glyph, FT_ULong render_mode, FT_Vector* origin, - FT_Bool destroy ) + FT_Bool destroy ) { FT_GlyphSlotRec dummy; FT_Error error; diff --git a/src/base/ftmm.c b/src/base/ftmm.c index 704175f8e..8e7478dd8 100644 --- a/src/base/ftmm.c +++ b/src/base/ftmm.c @@ -95,9 +95,9 @@ /* FreeType error code. 0 means success. */ /* */ FT_EXPORT_DEF( FT_Error ) FT_Set_MM_Design_Coordinates( - FT_Face face, - FT_UInt num_coords, - FT_Long* coords ) + FT_Face face, + FT_UInt num_coords, + FT_Long* coords ) { FT_Error error; @@ -145,9 +145,9 @@ /* FreeType error code. 0 means success. */ /* */ FT_EXPORT_DEF( FT_Error ) FT_Set_MM_Blend_Coordinates( - FT_Face face, - FT_UInt num_coords, - FT_Fixed* coords ) + FT_Face face, + FT_UInt num_coords, + FT_Fixed* coords ) { FT_Error error; diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index 0bac57934..4b97e2ed4 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -489,9 +489,9 @@ /* DOESN'T change the number of points within the loader! */ /* */ FT_BASE_DEF( FT_Error ) FT_GlyphLoader_Check_Points( - FT_GlyphLoader* loader, - FT_UInt n_points, - FT_UInt n_contours ) + FT_GlyphLoader* loader, + FT_UInt n_points, + FT_UInt n_contours ) { FT_Memory memory = loader->memory; FT_Error error = FT_Err_Ok; @@ -549,8 +549,8 @@ /* NOT change the number of subglyphs within the loader! */ /* */ FT_BASE_DEF( FT_Error ) FT_GlyphLoader_Check_Subglyphs( - FT_GlyphLoader* loader, - FT_UInt n_subs ) + FT_GlyphLoader* loader, + FT_UInt n_subs ) { FT_Memory memory = loader->memory; FT_Error error = FT_Err_Ok; @@ -617,8 +617,9 @@ } - FT_BASE_DEF( FT_Error ) FT_GlyphLoader_Copy_Points( FT_GlyphLoader* target, - FT_GlyphLoader* source ) + FT_BASE_DEF( FT_Error ) FT_GlyphLoader_Copy_Points( + FT_GlyphLoader* target, + FT_GlyphLoader* source ) { FT_Error error; FT_UInt num_points = source->base.outline.n_points; @@ -679,7 +680,7 @@ slot->library = driver->root.library; - if ( ALLOC( internal, sizeof( *internal ) ) ) + if ( ALLOC( internal, sizeof ( *internal ) ) ) goto Exit; slot->internal = internal; @@ -1069,9 +1070,10 @@ if ( renderer ) - error = renderer->clazz->transform_glyph( renderer, slot, - &internal->transform_matrix, - &internal->transform_delta ); + error = renderer->clazz->transform_glyph( + renderer, slot, + &internal->transform_matrix, + &internal->transform_delta ); /* transform advance */ FT_Vector_Transform( &slot->advance, &internal->transform_matrix ); } @@ -1257,7 +1259,7 @@ if ( ALLOC( face, clazz->face_object_size ) ) goto Fail; - if ( ALLOC( internal, sizeof(*internal) ) ) + if ( ALLOC( internal, sizeof ( *internal ) ) ) goto Fail; face->internal = internal; @@ -2073,19 +2075,19 @@ /* FreeType error code. 0 means success. */ /* */ /* */ - /* the values of "pixel_width" and "pixel_height" correspond to */ - /* the pixel values of the _typographic_ character size, which are */ - /* NOT necessarily the same as the dimensions of the glyph */ - /* "bitmap cells". */ + /* The values of `pixel_width' and `pixel_height' correspond to the */ + /* pixel values of the _typographic_ character size, which are NOT */ + /* necessarily the same as the dimensions of the glyph `bitmap */ + /* cells". */ /* */ - /* The "character size" is really the size of an abstract square */ - /* called the "EM", used to design the font. However, depending */ + /* The `character size' is really the size of an abstract square */ + /* called the `EM', used to design the font. However, depending */ /* on the font design, glyphs will be smaller or greater than the */ /* EM. */ /* */ - /* this means that setting the pixel size to 8x8 doesn't guarantee */ - /* in any way that you'll end up with glyph bitmaps that all fit */ - /* within an 8x8 cell.. far from it.. */ + /* This means that setting the pixel size to, say, 8x8 doesn't */ + /* guarantee in any way that you will get glyph bitmaps that all fit */ + /* within an 8x8 cell (sometimes even far from it). */ /* */ FT_EXPORT_DEF( FT_Error ) FT_Set_Pixel_Sizes( FT_Face face, FT_UInt pixel_width, @@ -2690,7 +2692,7 @@ FT_EXPORT( FT_Error ) FT_Set_Renderer( FT_Library library, FT_Renderer renderer, FT_UInt num_params, - FT_Parameter* parameters ) + FT_Parameter* parameters ) { FT_ListNode node; FT_Error error = FT_Err_Ok; diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c index eee3a6398..1477ec3da 100644 --- a/src/base/ftoutln.c +++ b/src/base/ftoutln.c @@ -66,9 +66,9 @@ /* FreeType error code. 0 means sucess. */ /* */ FT_EXPORT_DEF( FT_Error ) FT_Outline_Decompose( - FT_Outline* outline, - const FT_Outline_Funcs* interface, - void* user ) + FT_Outline* outline, + const FT_Outline_Funcs* interface, + void* user ) { #undef SCALED #define SCALED( x ) ( ( (x) << shift ) - delta ) @@ -271,10 +271,10 @@ FT_EXPORT_DEF( FT_Error ) FT_Outline_New_Internal( - FT_Memory memory, - FT_UInt numPoints, - FT_Int numContours, - FT_Outline* outline ) + FT_Memory memory, + FT_UInt numPoints, + FT_Int numContours, + FT_Outline* outline ) { FT_Error error; @@ -336,9 +336,9 @@ /* 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_UInt numPoints, + FT_Int numContours, + FT_Outline* outline ) { if ( !library ) return FT_Err_Invalid_Library_Handle; diff --git a/src/base/ftstream.c b/src/base/ftstream.c index 3ffa69c82..8f30e0110 100644 --- a/src/base/ftstream.c +++ b/src/base/ftstream.c @@ -46,7 +46,7 @@ FT_BASE_DEF( FT_Error ) FT_Seek_Stream( FT_Stream stream, - FT_ULong pos ) + FT_ULong pos ) { FT_Error error; diff --git a/src/base/ftsynth.c b/src/base/ftsynth.c index f49419a42..4858649d1 100644 --- a/src/base/ftsynth.c +++ b/src/base/ftsynth.c @@ -290,9 +290,9 @@ } - FT_EXPORT_DEF(FT_Error) FT_Outline_Embolden( FT_GlyphSlot original, - FT_Outline* outline, - FT_Pos* advance ) + FT_EXPORT_DEF( FT_Error ) FT_Outline_Embolden( FT_GlyphSlot original, + FT_Outline* outline, + FT_Pos* advance ) { FT_Vector u, v; FT_Vector* points; diff --git a/src/cache/ftcchunk.c b/src/cache/ftcchunk.c index d912320c2..bbea8289c 100644 --- a/src/cache/ftcchunk.c +++ b/src/cache/ftcchunk.c @@ -204,10 +204,10 @@ FT_EXPORT_DEF( FT_Error ) FTC_ChunkSet_Lookup_Node( - FTC_ChunkSet cset, - FT_UInt glyph_index, - FTC_ChunkNode* anode, - FT_UInt* aindex ) + FTC_ChunkSet cset, + FT_UInt glyph_index, + FTC_ChunkNode* anode, + FT_UInt* aindex ) { FTC_Chunk_Cache cache = cset->cache; FTC_Manager manager = cache->root.manager; diff --git a/src/cache/ftcglyph.c b/src/cache/ftcglyph.c index ed6acd72c..a4a6ce726 100644 --- a/src/cache/ftcglyph.c +++ b/src/cache/ftcglyph.c @@ -226,9 +226,9 @@ FT_EXPORT_DEF( FT_Error ) FTC_GlyphSet_Lookup_Node( - FTC_GlyphSet gset, - FT_UInt glyph_index, - FTC_GlyphNode* anode ) + FTC_GlyphSet gset, + FT_UInt glyph_index, + FTC_GlyphNode* anode ) { FTC_Glyph_Cache cache = gset->cache; FTC_Manager manager = cache->root.manager; diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c index 588edb6cd..15aa57bd2 100644 --- a/src/cache/ftcmanag.c +++ b/src/cache/ftcmanag.c @@ -426,9 +426,9 @@ FT_EXPORT( FT_Error ) FTC_Manager_Register_Cache( - FTC_Manager manager, - FTC_Cache_Class* clazz, - FTC_Cache* acache ) + FTC_Manager manager, + FTC_Cache_Class* clazz, + FTC_Cache* acache ) { FT_Error error = FT_Err_Invalid_Argument; diff --git a/src/cff/t2driver.h b/src/cff/t2driver.h index 1c62a280a..7b3bc4d91 100644 --- a/src/cff/t2driver.h +++ b/src/cff/t2driver.h @@ -26,7 +26,8 @@ #endif - FT_CALLBACK_TABLE const FT_Driver_Class cff_driver_class; + FT_CALLBACK_TABLE + const FT_Driver_Class cff_driver_class; #ifdef __cplusplus diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c index fc1ecc681..266b49951 100644 --- a/src/psaux/psobjs.c +++ b/src/psaux/psobjs.c @@ -151,7 +151,7 @@ /* FreeType error code. 0 means success. An error is returned if a */ /* reallocation fails. */ /* */ - FT_LOCAL + FT_LOCAL_DEF FT_Error PS_Table_Add( PS_Table* table, FT_Int index, void* object, diff --git a/src/psaux/t1decode.h b/src/psaux/t1decode.h index ede52ca20..b5f0f5d86 100644 --- a/src/psaux/t1decode.h +++ b/src/psaux/t1decode.h @@ -29,7 +29,8 @@ #endif - FT_CALLBACK_TABLE const T1_Decoder_Funcs t1_decoder_funcs; + FT_CALLBACK_TABLE + const T1_Decoder_Funcs t1_decoder_funcs; FT_LOCAL diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c index 2c1c0c57a..1aa53e196 100644 --- a/src/sfnt/ttcmap.c +++ b/src/sfnt/ttcmap.c @@ -43,14 +43,18 @@ #define FT_COMPONENT trace_ttcmap - FT_CALLBACK_DEF FT_UInt code_to_index0( TT_CMapTable* charmap, - FT_ULong char_code ); - FT_CALLBACK_DEF FT_UInt code_to_index2( TT_CMapTable* charmap, - FT_ULong char_code ); - FT_CALLBACK_DEF FT_UInt code_to_index4( TT_CMapTable* charmap, - FT_ULong char_code ); - FT_CALLBACK_DEF FT_UInt code_to_index6( TT_CMapTable* charmap, - FT_ULong char_code ); + FT_CALLBACK_DEF + FT_UInt code_to_index0( TT_CMapTable* charmap, + FT_ULong char_code ); + FT_CALLBACK_DEF + FT_UInt code_to_index2( TT_CMapTable* charmap, + FT_ULong char_code ); + FT_CALLBACK_DEF + FT_UInt code_to_index4( TT_CMapTable* charmap, + FT_ULong char_code ); + FT_CALLBACK_DEF + FT_UInt code_to_index6( TT_CMapTable* charmap, + FT_ULong char_code ); /*************************************************************************/ diff --git a/src/smooth/ftgrays.h b/src/smooth/ftgrays.h index 0e94713be..e1792c270 100644 --- a/src/smooth/ftgrays.h +++ b/src/smooth/ftgrays.h @@ -31,7 +31,7 @@ /*************************************************************************/ /* */ /* To make ftgrays.h independent from configuration files we check */ - /* whether FT_EXPORT has been defined already. */ + /* whether FT_EXPORT has been defined already. */ /* */ /* On some systems and compilers (Win32 mostly), an extra keyword is */ /* necessary to compile the library as a DLL. */ diff --git a/src/truetype/ttobjs.h b/src/truetype/ttobjs.h index 84ecf4dc7..829bae074 100644 --- a/src/truetype/ttobjs.h +++ b/src/truetype/ttobjs.h @@ -109,12 +109,14 @@ #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER - FT_LOCAL void TT_Done_GlyphZone( TT_GlyphZone* zone ); + FT_LOCAL + void TT_Done_GlyphZone( TT_GlyphZone* zone ); - FT_LOCAL FT_Error TT_New_GlyphZone( FT_Memory memory, - FT_UShort maxPoints, - FT_Short maxContours, - TT_GlyphZone* zone ); + FT_LOCAL + FT_Error TT_New_GlyphZone( FT_Memory memory, + FT_UShort maxPoints, + FT_Short maxContours, + TT_GlyphZone* zone ); #endif /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c index e6bd317f5..ef258e15b 100644 --- a/src/type1/t1gload.c +++ b/src/type1/t1gload.c @@ -219,9 +219,9 @@ glyph->root.metrics.horiBearingX = decoder.builder.left_bearing.x; glyph->root.metrics.horiAdvance = decoder.builder.advance.x; - internal->glyph_matrix = font_matrix; - internal->glyph_delta = font_offset; - internal->glyph_transformed = 1; + internal->glyph_matrix = font_matrix; + internal->glyph_delta = font_offset; + internal->glyph_transformed = 1; } else { @@ -230,8 +230,8 @@ /* copy the _unscaled_ advance width */ - metrics->horiAdvance = decoder.builder.advance.x; - glyph->root.linearHoriAdvance = decoder.builder.advance.x; + metrics->horiAdvance = decoder.builder.advance.x; + glyph->root.linearHoriAdvance = decoder.builder.advance.x; glyph->root.internal->glyph_transformed = 0; /* make up vertical metrics */