diff options
author | Werner Lemberg <wl@gnu.org> | 2001-06-27 19:46:12 +0000 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2001-06-27 19:46:12 +0000 |
commit | 93616ecb6601b133f9f33082c05d2675a556a001 (patch) | |
tree | dd416301dd8ad5936e1e23ef167bc544786d0a18 /src/cid | |
parent | 99b744164d3e4887f39e1cea28088d21d4ad6a4e (diff) | |
download | freetype2-93616ecb6601b133f9f33082c05d2675a556a001.tar.gz |
next round in function header formatting
Diffstat (limited to 'src/cid')
-rw-r--r-- | src/cid/cidgload.c | 18 | ||||
-rw-r--r-- | src/cid/cidgload.h | 16 | ||||
-rw-r--r-- | src/cid/cidload.c | 61 | ||||
-rw-r--r-- | src/cid/cidload.h | 18 | ||||
-rw-r--r-- | src/cid/cidobjs.c | 24 | ||||
-rw-r--r-- | src/cid/cidobjs.h | 24 | ||||
-rw-r--r-- | src/cid/cidparse.c | 14 | ||||
-rw-r--r-- | src/cid/cidparse.h | 16 | ||||
-rw-r--r-- | src/cid/cidriver.c | 25 |
9 files changed, 108 insertions, 108 deletions
diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c index 1074d2799..69794addb 100644 --- a/src/cid/cidgload.c +++ b/src/cid/cidgload.c @@ -36,7 +36,7 @@ #define FT_COMPONENT trace_cidgload - FT_CALLBACK_DEF(FT_Error) + FT_CALLBACK_DEF( FT_Error ) cid_load_glyph( T1_Decoder* decoder, FT_UInt glyph_index ) { @@ -138,9 +138,9 @@ /*************************************************************************/ - FT_LOCAL_DEF - FT_Error CID_Compute_Max_Advance( CID_Face face, - FT_Int* max_advance ) + FT_LOCAL_DEF FT_Error + CID_Compute_Max_Advance( CID_Face face, + FT_Int* max_advance ) { FT_Error error; T1_Decoder decoder; @@ -200,11 +200,11 @@ /*************************************************************************/ - FT_LOCAL_DEF - FT_Error CID_Load_Glyph( CID_GlyphSlot glyph, - CID_Size size, - FT_Int glyph_index, - FT_Int load_flags ) + FT_LOCAL_DEF FT_Error + CID_Load_Glyph( CID_GlyphSlot glyph, + CID_Size size, + FT_Int glyph_index, + FT_Int load_flags ) { FT_Error error; T1_Decoder decoder; diff --git a/src/cid/cidgload.h b/src/cid/cidgload.h index 44aed0f66..8f0ce3409 100644 --- a/src/cid/cidgload.h +++ b/src/cid/cidgload.h @@ -30,17 +30,17 @@ FT_BEGIN_HEADER #if 0 /* Compute the maximum advance width of a font through quick parsing */ - FT_LOCAL - FT_Error CID_Compute_Max_Advance( CID_Face face, - FT_Int* max_advance ); + FT_LOCAL FT_Error + CID_Compute_Max_Advance( CID_Face face, + FT_Int* max_advance ); #endif /* 0 */ - FT_LOCAL - FT_Error CID_Load_Glyph( CID_GlyphSlot glyph, - CID_Size size, - FT_Int glyph_index, - FT_Int load_flags ); + FT_LOCAL FT_Error + CID_Load_Glyph( CID_GlyphSlot glyph, + CID_Size size, + FT_Int glyph_index, + FT_Int load_flags ); FT_END_HEADER diff --git a/src/cid/cidload.c b/src/cid/cidload.c index 3b9f2b678..b67df5fc3 100644 --- a/src/cid/cidload.c +++ b/src/cid/cidload.c @@ -41,9 +41,9 @@ /* read a single offset */ - FT_LOCAL_DEF - FT_Long cid_get_offset( FT_Byte** start, - FT_Byte offsize ) + FT_LOCAL_DEF FT_Long + cid_get_offset( FT_Byte** start, + FT_Byte offsize ) { FT_Long result; FT_Byte* p = *start; @@ -60,10 +60,10 @@ } - FT_LOCAL_DEF - void cid_decrypt( FT_Byte* buffer, - FT_Offset length, - FT_UShort seed ) + FT_LOCAL_DEF void + cid_decrypt( FT_Byte* buffer, + FT_Offset length, + FT_UShort seed ) { while ( length > 0 ) { @@ -87,10 +87,10 @@ /*************************************************************************/ - static - FT_Error cid_load_keyword( CID_Face face, - CID_Loader* loader, - const T1_Field* keyword ) + static FT_Error + cid_load_keyword( CID_Face face, + CID_Loader* loader, + const T1_Field* keyword ) { FT_Error error; CID_Parser* parser = &loader->parser; @@ -158,7 +158,7 @@ } - FT_CALLBACK_DEF(FT_Error) + FT_CALLBACK_DEF( FT_Error ) parse_font_bbox( CID_Face face, CID_Parser* parser ) { @@ -177,7 +177,7 @@ } - FT_CALLBACK_DEF(FT_Error) + FT_CALLBACK_DEF( FT_Error ) parse_font_matrix( CID_Face face, CID_Parser* parser ) { @@ -231,7 +231,7 @@ } - FT_CALLBACK_DEF(FT_Error) + FT_CALLBACK_DEF( FT_Error ) parse_fd_array( CID_Face face, CID_Parser* parser ) { @@ -282,8 +282,8 @@ }; - static - int is_alpha( char c ) + static int + is_alpha( char c ) { return ( isalnum( (int)c ) || c == '.' || @@ -291,12 +291,11 @@ } - - static - FT_Error cid_parse_dict( CID_Face face, - CID_Loader* loader, - FT_Byte* base, - FT_Long size ) + static FT_Error + cid_parse_dict( CID_Face face, + CID_Loader* loader, + FT_Byte* base, + FT_Long size ) { CID_Parser* parser = &loader->parser; @@ -388,8 +387,8 @@ /* read the subrmap and the subrs of each font dict */ - static - FT_Error cid_read_subrs( CID_Face face ) + static FT_Error + cid_read_subrs( CID_Face face ) { CID_Info* cid = &face->cid; FT_Memory memory = face->root.memory; @@ -495,9 +494,9 @@ } - static - void t1_init_loader( CID_Loader* loader, - CID_Face face ) + static void + t1_init_loader( CID_Loader* loader, + CID_Face face ) { FT_UNUSED( face ); @@ -505,8 +504,8 @@ } - static - void t1_done_loader( CID_Loader* loader ) + static void + t1_done_loader( CID_Loader* loader ) { CID_Parser* parser = &loader->parser; @@ -516,8 +515,8 @@ } - FT_LOCAL_DEF - FT_Error CID_Open_Face( CID_Face face ) + FT_LOCAL_DEF FT_Error + CID_Open_Face( CID_Face face ) { CID_Loader loader; CID_Parser* parser; diff --git a/src/cid/cidload.h b/src/cid/cidload.h index 156b619ad..55a5609bf 100644 --- a/src/cid/cidload.h +++ b/src/cid/cidload.h @@ -36,17 +36,17 @@ FT_BEGIN_HEADER } CID_Loader; - FT_LOCAL - FT_Long cid_get_offset( FT_Byte** start, - FT_Byte offsize ); + FT_LOCAL FT_Long + cid_get_offset( FT_Byte** start, + FT_Byte offsize ); - FT_LOCAL - void cid_decrypt( FT_Byte* buffer, - FT_Offset length, - FT_UShort seed ); + FT_LOCAL void + cid_decrypt( FT_Byte* buffer, + FT_Offset length, + FT_UShort seed ); - FT_LOCAL - FT_Error CID_Open_Face( CID_Face face ); + FT_LOCAL FT_Error + CID_Open_Face( CID_Face face ); FT_END_HEADER diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c index efca5ec3c..0369efadf 100644 --- a/src/cid/cidobjs.c +++ b/src/cid/cidobjs.c @@ -55,8 +55,8 @@ /* <Input> */ /* face :: A pointer to the face object to destroy. */ /* */ - FT_LOCAL_DEF - void CID_Done_Face( CID_Face face ) + FT_LOCAL_DEF void + CID_Done_Face( CID_Face face ) { FT_Memory memory; @@ -114,12 +114,12 @@ /* <Return> */ /* FreeType error code. 0 means success. */ /* */ - FT_LOCAL_DEF - FT_Error CID_Init_Face( FT_Stream stream, - CID_Face face, - FT_Int face_index, - FT_Int num_params, - FT_Parameter* params ) + FT_LOCAL_DEF FT_Error + CID_Init_Face( FT_Stream stream, + CID_Face face, + FT_Int face_index, + FT_Int num_params, + FT_Parameter* params ) { FT_Error error; PSNames_Interface* psnames; @@ -353,8 +353,8 @@ /* <Return> */ /* FreeType error code. 0 means success. */ /* */ - FT_LOCAL_DEF - FT_Error CID_Init_Driver( CID_Driver driver ) + FT_LOCAL_DEF FT_Error + CID_Init_Driver( CID_Driver driver ) { FT_UNUSED( driver ); @@ -373,8 +373,8 @@ /* <Input> */ /* driver :: A handle to the target CID driver. */ /* */ - FT_LOCAL_DEF - void CID_Done_Driver( CID_Driver driver ) + FT_LOCAL_DEF void + CID_Done_Driver( CID_Driver driver ) { FT_UNUSED( driver ); } diff --git a/src/cid/cidobjs.h b/src/cid/cidobjs.h index 6003cf590..db5d2f60f 100644 --- a/src/cid/cidobjs.h +++ b/src/cid/cidobjs.h @@ -111,22 +111,22 @@ FT_BEGIN_HEADER } CID_GlyphSlotRec; - FT_LOCAL - FT_Error CID_Init_Face( FT_Stream stream, - CID_Face face, - FT_Int face_index, - FT_Int num_params, - FT_Parameter* params ); + FT_LOCAL FT_Error + CID_Init_Face( FT_Stream stream, + CID_Face face, + FT_Int face_index, + FT_Int num_params, + FT_Parameter* params ); - FT_LOCAL - void CID_Done_Face( CID_Face face ); + FT_LOCAL void + CID_Done_Face( CID_Face face ); - FT_LOCAL - FT_Error CID_Init_Driver( CID_Driver driver ); + FT_LOCAL FT_Error + CID_Init_Driver( CID_Driver driver ); - FT_LOCAL - void CID_Done_Driver( CID_Driver driver ); + FT_LOCAL void + CID_Done_Driver( CID_Driver driver ); FT_END_HEADER diff --git a/src/cid/cidparse.c b/src/cid/cidparse.c index c243687b9..a8c79c4ba 100644 --- a/src/cid/cidparse.c +++ b/src/cid/cidparse.c @@ -50,11 +50,11 @@ /*************************************************************************/ - FT_LOCAL_DEF - FT_Error CID_New_Parser( CID_Parser* parser, - FT_Stream stream, - FT_Memory memory, - PSAux_Interface* psaux ) + FT_LOCAL_DEF FT_Error + CID_New_Parser( CID_Parser* parser, + FT_Stream stream, + FT_Memory memory, + PSAux_Interface* psaux ) { FT_Error error; FT_ULong base_offset, offset, ps_len; @@ -139,8 +139,8 @@ } - FT_LOCAL_DEF - void CID_Done_Parser( CID_Parser* parser ) + FT_LOCAL_DEF void + CID_Done_Parser( CID_Parser* parser ) { /* always free the private dictionary */ if ( parser->postscript ) diff --git a/src/cid/cidparse.h b/src/cid/cidparse.h index c6aaa3ed7..04bba3d89 100644 --- a/src/cid/cidparse.h +++ b/src/cid/cidparse.h @@ -55,7 +55,7 @@ FT_BEGIN_HEADER /* */ /* num_dict :: The number of font dictionaries. */ /* */ - typedef struct CID_Parser_ + typedef struct CID_Parser_ { T1_Parser root; FT_Stream stream; @@ -71,14 +71,14 @@ FT_BEGIN_HEADER } CID_Parser; - FT_LOCAL - FT_Error CID_New_Parser( CID_Parser* parser, - FT_Stream stream, - FT_Memory memory, - PSAux_Interface* psaux ); + FT_LOCAL FT_Error + CID_New_Parser( CID_Parser* parser, + FT_Stream stream, + FT_Memory memory, + PSAux_Interface* psaux ); - FT_LOCAL - void CID_Done_Parser( CID_Parser* parser ); + FT_LOCAL void + CID_Done_Parser( CID_Parser* parser ); /*************************************************************************/ diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c index 566fba8fc..432c8a950 100644 --- a/src/cid/cidriver.c +++ b/src/cid/cidriver.c @@ -38,9 +38,9 @@ #define FT_COMPONENT trace_ciddriver - static - FT_Module_Interface CID_Get_Interface( FT_Driver driver, - const FT_String* interface ) + static FT_Module_Interface + CID_Get_Interface( FT_Driver driver, + const FT_String* interface ) { FT_UNUSED( driver ); FT_UNUSED( interface ); @@ -51,11 +51,11 @@ #if 0 /* unimplemented yet */ - static - FT_Error cid_Get_Kerning( T1_Face face, - FT_UInt left_glyph, - FT_UInt right_glyph, - FT_Vector* kerning ) + static FT_Error + cid_Get_Kerning( T1_Face face, + FT_UInt left_glyph, + FT_UInt right_glyph, + FT_Vector* kerning ) { CID_AFM* afm; @@ -90,9 +90,9 @@ /* <Return> */ /* Glyph index. 0 means `undefined character code'. */ /* */ - static - FT_UInt CID_Get_Char_Index( FT_CharMap charmap, - FT_Long charcode ) + static FT_UInt + CID_Get_Char_Index( FT_CharMap charmap, + FT_Long charcode ) { T1_Face face; FT_UInt result = 0; @@ -240,7 +240,8 @@ /* format-specific interface can then be retrieved through the method */ /* interface->get_format_interface. */ /* */ - FT_EXPORT_DEF( const FT_Driver_Class* ) getDriverClass( void ) + FT_EXPORT_DEF( const FT_Driver_Class* ) + getDriverClass( void ) { return &t1cid_driver_class; } |