ReceiveTempSMS
/
Al-Qurtas-Islamic-bank-The-Best-Bank-in-Iraq
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

next round in function header formatting

This commit is contained in:
Werner Lemberg 2001-06-27 19:46:12 +00:00
parent 99b744164d
commit 93616ecb66
29 changed files with 885 additions and 874 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/cff/cffdrivr.c
View File

@ -90,11 +90,11 @@
/* */
/* They can be implemented by format-specific interfaces. */
/* */
static
FT_Error Get_Kerning( TT_Face face,
FT_UInt left_glyph,
FT_UInt right_glyph,
FT_Vector* kerning )
static FT_Error
Get_Kerning( TT_Face face,
FT_UInt left_glyph,
FT_UInt right_glyph,
FT_Vector* kerning )
{
TT_Kern_0_Pair* pair;
@ -172,11 +172,11 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
static
FT_Error Load_Glyph( CFF_GlyphSlot slot,
CFF_Size size,
FT_UShort glyph_index,
FT_UInt load_flags )
static FT_Error
Load_Glyph( CFF_GlyphSlot slot,
CFF_Size size,
FT_UShort glyph_index,
FT_UInt load_flags )
{
FT_Error error;
@ -221,11 +221,11 @@
/*************************************************************************/
/*************************************************************************/
static
FT_Error get_cff_glyph_name( CFF_Face face,
FT_UInt glyph_index,
FT_Pointer buffer,
FT_UInt buffer_max )
static FT_Error
get_cff_glyph_name( CFF_Face face,
FT_UInt glyph_index,
FT_Pointer buffer,
FT_UInt buffer_max )
{
CFF_Font* font = (CFF_Font*)face->extra.data;
FT_Memory memory = FT_FACE_MEMORY(face);
@ -288,9 +288,9 @@
/* <Return> */
/* Glyph index. 0 means `undefined character code'. */
/* */
static
FT_UInt cff_get_char_index( TT_CharMap charmap,
FT_Long charcode )
static FT_UInt
cff_get_char_index( TT_CharMap charmap,
FT_Long charcode )
{
FT_Error error;
CFF_Face face;
@ -329,9 +329,9 @@
/*************************************************************************/
/*************************************************************************/
static
FT_Module_Interface cff_get_interface( CFF_Driver driver,
const char* interface )
static FT_Module_Interface
cff_get_interface( CFF_Driver driver,
const char* interface )
{
FT_Module sfnt;
@ -413,7 +413,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 &cff_driver_class;
}

116
src/cff/cffgload.c
View File

@ -220,11 +220,11 @@
/* */
/* glyph :: The current glyph object. */
/* */
static
void CFF_Init_Builder( CFF_Builder* builder,
TT_Face face,
CFF_Size size,
CFF_GlyphSlot glyph )
static void
CFF_Init_Builder( CFF_Builder* builder,
TT_Face face,
CFF_Size size,
CFF_GlyphSlot glyph )
{
builder->path_begun = 0;
builder->load_points = 1;
@ -273,8 +273,8 @@
/* <Input> */
/* builder :: A pointer to the glyph builder to finalize. */
/* */
static
void CFF_Done_Builder( CFF_Builder* builder )
static void
CFF_Done_Builder( CFF_Builder* builder )
{
CFF_GlyphSlot glyph = builder->glyph;
@ -298,8 +298,8 @@
/* */
/* <Return> */
/* The bias value. */
static
FT_Int cff_compute_bias( FT_UInt num_subrs )
static FT_Int
cff_compute_bias( FT_UInt num_subrs )
{
FT_Int result;
@ -333,11 +333,11 @@
/* */
/* slot :: The current glyph object. */
/* */
FT_LOCAL_DEF
void CFF_Init_Decoder( CFF_Decoder* decoder,
TT_Face face,
CFF_Size size,
CFF_GlyphSlot slot )
FT_LOCAL_DEF void
CFF_Init_Decoder( CFF_Decoder* decoder,
TT_Face face,
CFF_Size size,
CFF_GlyphSlot slot )
{
CFF_Font* cff = (CFF_Font*)face->extra.data;
@ -356,9 +356,9 @@
/* this function is used to select the locals subrs array */
FT_LOCAL_DEF
void CFF_Prepare_Decoder( CFF_Decoder* decoder,
FT_UInt glyph_index )
FT_LOCAL_DEF void
CFF_Prepare_Decoder( CFF_Decoder* decoder,
FT_UInt glyph_index )
{
CFF_Font* cff = (CFF_Font*)decoder->builder.face->extra.data;
CFF_SubFont* sub = &cff->top_font;
@ -383,20 +383,20 @@
/* check that there is enough room for `count' more points */
static
FT_Error check_points( CFF_Builder* builder,
FT_Int count )
static FT_Error
check_points( CFF_Builder* builder,
FT_Int count )
{
return FT_GlyphLoader_Check_Points( builder->loader, count, 0 );
}
/* add a new point, do not check space */
static
void add_point( CFF_Builder* builder,
FT_Pos x,
FT_Pos y,
FT_Byte flag )
static void
add_point( CFF_Builder* builder,
FT_Pos x,
FT_Pos y,
FT_Byte flag )
{
FT_Outline* outline = builder->current;
@ -418,10 +418,10 @@
/* check space for a new on-curve point, then add it */
static
FT_Error add_point1( CFF_Builder* builder,
FT_Pos x,
FT_Pos y )
static FT_Error
add_point1( CFF_Builder* builder,
FT_Pos x,
FT_Pos y )
{
FT_Error error;
@ -435,8 +435,8 @@
/* check room for a new contour, then add it */
static
FT_Error add_contour( CFF_Builder* builder )
static FT_Error
add_contour( CFF_Builder* builder )
{
FT_Outline* outline = builder->current;
FT_Error error;
@ -463,10 +463,10 @@
/* if a path was begun, add its first on-curve point */
static
FT_Error start_point( CFF_Builder* builder,
FT_Pos x,
FT_Pos y )
static FT_Error
start_point( CFF_Builder* builder,
FT_Pos x,
FT_Pos y )
{
FT_Error error = 0;
@ -484,8 +484,8 @@
/* close the current contour */
static
void close_contour( CFF_Builder* builder )
static void
close_contour( CFF_Builder* builder )
{
FT_Outline* outline = builder->current;
@ -518,9 +518,9 @@
}
static
FT_Int cff_lookup_glyph_by_stdcharcode( CFF_Font* cff,
FT_Int charcode )
static FT_Int
cff_lookup_glyph_by_stdcharcode( CFF_Font* cff,
FT_Int charcode )
{
FT_UInt n;
FT_UShort glyph_sid;
@ -544,12 +544,12 @@
}
static
FT_Error cff_operator_seac( CFF_Decoder* decoder,
FT_Pos adx,
FT_Pos ady,
FT_Int bchar,
FT_Int achar )
static FT_Error
cff_operator_seac( CFF_Decoder* decoder,
FT_Pos adx,
FT_Pos ady,
FT_Int bchar,
FT_Int achar )
{
FT_Error error;
FT_Int bchar_index, achar_index, n_base_points;
@ -687,10 +687,10 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
FT_LOCAL_DEF
FT_Error CFF_Parse_CharStrings( CFF_Decoder* decoder,
FT_Byte* charstring_base,
FT_Int charstring_len )
FT_LOCAL_DEF FT_Error
CFF_Parse_CharStrings( CFF_Decoder* decoder,
FT_Byte* charstring_base,
FT_Int charstring_len )
{
FT_Error error;
CFF_Decoder_Zone* zone;
@ -2047,9 +2047,9 @@
#if 0 /* unused until we support pure CFF fonts */
FT_LOCAL_DEF
FT_Error CFF_Compute_Max_Advance( TT_Face face,
FT_Int* max_advance )
FT_LOCAL_DEF FT_Error
CFF_Compute_Max_Advance( TT_Face face,
FT_Int* max_advance )
{
FT_Error error = 0;
CFF_Decoder decoder;
@ -2114,11 +2114,11 @@
/*************************************************************************/
FT_LOCAL_DEF
FT_Error CFF_Load_Glyph( CFF_GlyphSlot glyph,
CFF_Size size,
FT_Int glyph_index,
FT_Int load_flags )
FT_LOCAL_DEF FT_Error
CFF_Load_Glyph( CFF_GlyphSlot glyph,
CFF_Size size,
FT_Int glyph_index,
FT_Int load_flags )
{
FT_Error error;
CFF_Decoder decoder;

40
src/cff/cffgload.h
View File

@ -164,35 +164,35 @@ FT_BEGIN_HEADER
} CFF_Decoder;
FT_LOCAL
void CFF_Init_Decoder( CFF_Decoder* decoder,
TT_Face face,
CFF_Size size,
CFF_GlyphSlot slot );
FT_LOCAL void
CFF_Init_Decoder( CFF_Decoder* decoder,
TT_Face face,
CFF_Size size,
CFF_GlyphSlot slot );
FT_LOCAL
void CFF_Prepare_Decoder( CFF_Decoder* decoder,
FT_UInt glyph_index );
FT_LOCAL void
CFF_Prepare_Decoder( CFF_Decoder* decoder,
FT_UInt glyph_index );
#if 0 /* unused until we support pure CFF fonts */
/* Compute the maximum advance width of a font through quick parsing */
FT_LOCAL
FT_Error CFF_Compute_Max_Advance( TT_Face face,
FT_Int* max_advance );
FT_LOCAL FT_Error
CFF_Compute_Max_Advance( TT_Face face,
FT_Int* max_advance );
#endif /* 0 */
FT_LOCAL
FT_Error CFF_Parse_CharStrings( CFF_Decoder* decoder,
FT_Byte* charstring_base,
FT_Int charstring_len );
FT_LOCAL FT_Error
CFF_Parse_CharStrings( CFF_Decoder* decoder,
FT_Byte* charstring_base,
FT_Int charstring_len );
FT_LOCAL
FT_Error CFF_Load_Glyph( CFF_GlyphSlot glyph,
CFF_Size size,
FT_Int glyph_index,
FT_Int load_flags );
FT_LOCAL FT_Error
CFF_Load_Glyph( CFF_GlyphSlot glyph,
CFF_Size size,
FT_Int glyph_index,
FT_Int load_flags );
FT_END_HEADER

144
src/cff/cffload.c
View File

@ -1055,9 +1055,9 @@
/* read a CFF offset from memory */
static
FT_ULong cff_get_offset( FT_Byte* p,
FT_Byte off_size )
static FT_ULong
cff_get_offset( FT_Byte* p,
FT_Byte off_size )
{
FT_ULong result;
@ -1072,10 +1072,10 @@
}
static
FT_Error cff_new_index( CFF_Index* index,
FT_Stream stream,
FT_Bool load )
static FT_Error
cff_new_index( CFF_Index* index,
FT_Stream stream,
FT_Bool load )
{
FT_Error error;
FT_Memory memory = stream->memory;
@ -1145,8 +1145,8 @@
}
static
void cff_done_index( CFF_Index* index )
static void
cff_done_index( CFF_Index* index )
{
if ( index->stream )
{
@ -1163,9 +1163,9 @@
}
static
FT_Error cff_explicit_index( CFF_Index* index,
FT_Byte*** table )
static FT_Error
cff_explicit_index( CFF_Index* index,
FT_Byte*** table )
{
FT_Error error = 0;
FT_Memory memory = index->stream->memory;
@ -1195,11 +1195,11 @@
}
FT_LOCAL_DEF
FT_Error CFF_Access_Element( CFF_Index* index,
FT_UInt element,
FT_Byte** pbytes,
FT_ULong* pbyte_len )
FT_LOCAL_DEF FT_Error
CFF_Access_Element( CFF_Index* index,
FT_UInt element,
FT_Byte** pbytes,
FT_ULong* pbyte_len )
{
FT_Error error = 0;
@ -1260,9 +1260,9 @@
}
FT_LOCAL_DEF
void CFF_Forget_Element( CFF_Index* index,
FT_Byte** pbytes )
FT_LOCAL_DEF void
CFF_Forget_Element( CFF_Index* index,
FT_Byte** pbytes )
{
if ( index->bytes == 0 )
{
@ -1274,9 +1274,9 @@
}
FT_LOCAL_DEF
FT_String* CFF_Get_Name( CFF_Index* index,
FT_UInt element )
FT_LOCAL_DEF FT_String*
CFF_Get_Name( CFF_Index* index,
FT_UInt element )
{
FT_Memory memory = index->stream->memory;
FT_Byte* bytes;
@ -1301,10 +1301,10 @@
}
FT_LOCAL_DEF
FT_String* CFF_Get_String( CFF_Index* index,
FT_UInt sid,
PSNames_Interface* interface )
FT_LOCAL_DEF FT_String*
CFF_Get_String( CFF_Index* index,
FT_UInt sid,
PSNames_Interface* interface )
{
/* if it is not a standard string, return it */
if ( sid > 390 )
@ -1345,9 +1345,9 @@
/*************************************************************************/
static
void CFF_Done_FD_Select( CFF_FD_Select* select,
FT_Stream stream )
static void
CFF_Done_FD_Select( CFF_FD_Select* select,
FT_Stream stream )
{
if ( select->data )
RELEASE_Frame( select->data );
@ -1358,11 +1358,11 @@
}
static
FT_Error CFF_Load_FD_Select( CFF_FD_Select* select,
FT_UInt num_glyphs,
FT_Stream stream,
FT_ULong offset )
static FT_Error
CFF_Load_FD_Select( CFF_FD_Select* select,
FT_UInt num_glyphs,
FT_Stream stream,
FT_ULong offset )
{
FT_Error error;
FT_Byte format;
@ -1402,9 +1402,9 @@
}
FT_LOCAL_DEF
FT_Byte CFF_Get_FD( CFF_FD_Select* select,
FT_UInt glyph_index )
FT_LOCAL_DEF FT_Byte
CFF_Get_FD( CFF_FD_Select* select,
FT_UInt glyph_index )
{
FT_Byte fd = 0;
@ -1472,9 +1472,9 @@
/*************************************************************************/
/*************************************************************************/
static
void CFF_Done_Encoding( CFF_Encoding* encoding,
FT_Stream stream )
static void
CFF_Done_Encoding( CFF_Encoding* encoding,
FT_Stream stream )
{
FT_Memory memory = stream->memory;
@ -1488,9 +1488,9 @@
}
static
void CFF_Done_Charset( CFF_Charset* charset,
FT_Stream stream )
static void
CFF_Done_Charset( CFF_Charset* charset,
FT_Stream stream )
{
FT_Memory memory = stream->memory;
@ -1502,12 +1502,12 @@
}
static
FT_Error CFF_Load_Charset( CFF_Charset* charset,
FT_UInt num_glyphs,
FT_Stream stream,
FT_ULong base_offset,
FT_ULong offset )
static FT_Error
CFF_Load_Charset( CFF_Charset* charset,
FT_UInt num_glyphs,
FT_Stream stream,
FT_ULong base_offset,
FT_ULong offset )
{
FT_Memory memory = stream->memory;
FT_Error error = 0;
@ -1681,13 +1681,13 @@
}
static
FT_Error CFF_Load_Encoding( CFF_Encoding* encoding,
CFF_Charset* charset,
FT_UInt num_glyphs,
FT_Stream stream,
FT_ULong base_offset,
FT_ULong offset )
static FT_Error
CFF_Load_Encoding( CFF_Encoding* encoding,
CFF_Charset* charset,
FT_UInt num_glyphs,
FT_Stream stream,
FT_ULong base_offset,
FT_ULong offset )
{
FT_Memory memory = stream->memory;
FT_Error error = 0;
@ -1945,12 +1945,12 @@
}
static
FT_Error CFF_Load_SubFont( CFF_SubFont* font,
CFF_Index* index,
FT_UInt font_index,
FT_Stream stream,
FT_ULong base_offset )
static FT_Error
CFF_Load_SubFont( CFF_SubFont* font,
CFF_Index* index,
FT_UInt font_index,
FT_Stream stream,
FT_ULong base_offset )
{
FT_Error error;
CFF_Parser parser;
@ -2033,9 +2033,9 @@
}
static
void CFF_Done_SubFont( FT_Memory memory,
CFF_SubFont* subfont )
static void
CFF_Done_SubFont( FT_Memory memory,
CFF_SubFont* subfont )
{
if ( subfont )
{
@ -2045,10 +2045,10 @@
}
FT_LOCAL_DEF
FT_Error CFF_Load_Font( FT_Stream stream,
FT_Int face_index,
CFF_Font* font )
FT_LOCAL_DEF FT_Error
CFF_Load_Font( FT_Stream stream,
FT_Int face_index,
CFF_Font* font )
{
static const FT_Frame_Field cff_header_fields[] =
{
@ -2228,8 +2228,8 @@
}
FT_LOCAL_DEF
void CFF_Done_Font( CFF_Font* font )
FT_LOCAL_DEF void
CFF_Done_Font( CFF_Font* font )
{
FT_Memory memory = font->memory;
FT_UInt index;

48
src/cff/cffload.h
View File

@ -33,39 +33,39 @@ FT_BEGIN_HEADER
extern const FT_UShort cff_standard_encoding[];
extern const FT_UShort cff_expert_encoding[];
FT_LOCAL
FT_String* CFF_Get_Name( CFF_Index* index,
FT_UInt element );
FT_LOCAL FT_String*
CFF_Get_Name( CFF_Index* index,
FT_UInt element );
FT_LOCAL
FT_String* CFF_Get_String( CFF_Index* index,
FT_UInt sid,
PSNames_Interface* interface );
FT_LOCAL FT_String*
CFF_Get_String( CFF_Index* index,
FT_UInt sid,
PSNames_Interface* interface );
FT_LOCAL
FT_Error CFF_Access_Element( CFF_Index* index,
FT_UInt element,
FT_Byte** pbytes,
FT_ULong* pbyte_len );
FT_LOCAL FT_Error
CFF_Access_Element( CFF_Index* index,
FT_UInt element,
FT_Byte** pbytes,
FT_ULong* pbyte_len );
FT_LOCAL
void CFF_Forget_Element( CFF_Index* index,
FT_Byte** pbytes );
FT_LOCAL void
CFF_Forget_Element( CFF_Index* index,
FT_Byte** pbytes );
FT_LOCAL
FT_Error CFF_Load_Font( FT_Stream stream,
FT_Int face_index,
CFF_Font* font );
FT_LOCAL FT_Error
CFF_Load_Font( FT_Stream stream,
FT_Int face_index,
CFF_Font* font );
FT_LOCAL
void CFF_Done_Font( CFF_Font* font );
FT_LOCAL void
CFF_Done_Font( CFF_Font* font );
FT_LOCAL
FT_Byte CFF_Get_FD( CFF_FD_Select* select,
FT_UInt glyph_index );
FT_LOCAL FT_Byte
CFF_Get_FD( CFF_FD_Select* select,
FT_UInt glyph_index );
FT_END_HEADER

44
src/cff/cffobjs.c
View File

@ -49,9 +49,9 @@
/* */
/*************************************************************************/
static
FT_String* CFF_StrCopy( FT_Memory memory,
const FT_String* source )
static FT_String*
CFF_StrCopy( FT_Memory memory,
const FT_String* source )
{
FT_Error error;
FT_String* result = 0;
@ -71,10 +71,10 @@
/* this function is used to build a Unicode charmap from the glyph names */
/* in a file */
static
FT_Error CFF_Build_Unicode_Charmap( CFF_Face face,
FT_ULong base_offset,
PSNames_Interface* psnames )
static FT_Error
CFF_Build_Unicode_Charmap( CFF_Face face,
FT_ULong base_offset,
PSNames_Interface* psnames )
{
CFF_Font* font = (CFF_Font*)face->extra.data;
FT_Memory memory = FT_FACE_MEMORY(face);
@ -188,9 +188,9 @@
#endif /* 0 */
static
FT_Encoding find_encoding( int platform_id,
int encoding_id )
static FT_Encoding
find_encoding( int platform_id,
int encoding_id )
{
typedef struct TEncoding
{
@ -260,12 +260,12 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
FT_LOCAL_DEF
FT_Error CFF_Init_Face( FT_Stream stream,
CFF_Face face,
FT_Int face_index,
FT_Int num_params,
FT_Parameter* params )
FT_LOCAL_DEF FT_Error
CFF_Init_Face( FT_Stream stream,
CFF_Face face,
FT_Int face_index,
FT_Int num_params,
FT_Parameter* params )
{
FT_Error error;
SFNT_Interface* sfnt;
@ -511,8 +511,8 @@
/* <Input> */
/* face :: A pointer to the face object to destroy. */
/* */
FT_LOCAL_DEF
void CFF_Done_Face( CFF_Face face )
FT_LOCAL_DEF void
CFF_Done_Face( CFF_Face face )
{
FT_Memory memory = face->root.memory;
SFNT_Interface* sfnt = (SFNT_Interface*)face->sfnt;
@ -548,8 +548,8 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
FT_LOCAL_DEF
FT_Error CFF_Init_Driver( CFF_Driver driver )
FT_LOCAL_DEF FT_Error
CFF_Init_Driver( CFF_Driver driver )
{
/* init extension registry if needed */
@ -578,8 +578,8 @@
/* <Input> */
/* driver :: A handle to the target OpenType driver. */
/* */
FT_LOCAL_DEF
void CFF_Done_Driver( CFF_Driver driver )
FT_LOCAL_DEF void
CFF_Done_Driver( CFF_Driver driver )
{
/* destroy extensions registry if needed */

24
src/cff/cffobjs.h
View File

@ -113,26 +113,26 @@ FT_BEGIN_HEADER
/* */
/* Face functions */
/* */
FT_LOCAL
FT_Error CFF_Init_Face( FT_Stream stream,
CFF_Face face,
FT_Int face_index,
FT_Int num_params,
FT_Parameter* params );
FT_LOCAL FT_Error
CFF_Init_Face( FT_Stream stream,
CFF_Face face,
FT_Int face_index,
FT_Int num_params,
FT_Parameter* params );
FT_LOCAL
void CFF_Done_Face( CFF_Face face );
FT_LOCAL void
CFF_Done_Face( CFF_Face face );
/*************************************************************************/
/* */
/* Driver functions */
/* */
FT_LOCAL
FT_Error CFF_Init_Driver( CFF_Driver driver );
FT_LOCAL FT_Error
CFF_Init_Driver( CFF_Driver driver );
FT_LOCAL
void CFF_Done_Driver( CFF_Driver driver );
FT_LOCAL void
CFF_Done_Driver( CFF_Driver driver );
FT_END_HEADER

58
src/cff/cffparse.c
View File

@ -63,10 +63,10 @@
} CFF_Field_Handler;
FT_LOCAL_DEF
void CFF_Parser_Init( CFF_Parser* parser,
FT_UInt code,
void* object )
FT_LOCAL_DEF void
CFF_Parser_Init( CFF_Parser* parser,
FT_UInt code,
void* object )
{
MEM_Set( parser, 0, sizeof ( *parser ) );
@ -77,9 +77,9 @@
/* read an integer */
static
FT_Long cff_parse_integer( FT_Byte* start,
FT_Byte* limit )
static FT_Long
cff_parse_integer( FT_Byte* start,
FT_Byte* limit )
{
FT_Byte* p = start;
FT_Int v = *p++;
@ -136,10 +136,10 @@
/* read a real */
static
FT_Fixed cff_parse_real( FT_Byte* start,
FT_Byte* limit,
FT_Int power_ten )
static FT_Fixed
cff_parse_real( FT_Byte* start,
FT_Byte* limit,
FT_Int power_ten )
{
FT_Byte* p = start;
FT_Long num, divider, result, exp;
@ -284,8 +284,8 @@
/* read a number, either integer or real */
static
FT_Long cff_parse_num( FT_Byte** d )
static FT_Long
cff_parse_num( FT_Byte** d )
{
return ( **d == 30 ? ( cff_parse_real ( d[0], d[1], 0 ) >> 16 )
: cff_parse_integer( d[0], d[1] ) );
@ -293,8 +293,8 @@
/* read a floating point number, either integer or real */
static
FT_Fixed cff_parse_fixed( FT_Byte** d )
static FT_Fixed
cff_parse_fixed( FT_Byte** d )
{
return ( **d == 30 ? cff_parse_real ( d[0], d[1], 0 )
: cff_parse_integer( d[0], d[1] ) << 16 );
@ -302,16 +302,16 @@
/* read a floating point number, either integer or real, */
/* but return 1000 times the number read in. */
static
FT_Fixed cff_parse_fixed_thousand( FT_Byte** d )
static FT_Fixed
cff_parse_fixed_thousand( FT_Byte** d )
{
return **d ==
30 ? cff_parse_real ( d[0], d[1], 3 )
: (FT_Fixed)FT_MulFix( cff_parse_integer( d[0], d[1] ) << 16, 1000 );
}
static
FT_Error cff_parse_font_matrix( CFF_Parser* parser )
static FT_Error
cff_parse_font_matrix( CFF_Parser* parser )
{
CFF_Font_Dict* dict = (CFF_Font_Dict*)parser->object;
FT_Matrix* matrix = &dict->font_matrix;
@ -358,8 +358,8 @@
}
static
FT_Error cff_parse_font_bbox( CFF_Parser* parser )
static FT_Error
cff_parse_font_bbox( CFF_Parser* parser )
{
CFF_Font_Dict* dict = (CFF_Font_Dict*)parser->object;
FT_BBox* bbox = &dict->font_bbox;
@ -382,8 +382,8 @@
}
static
FT_Error cff_parse_private_dict( CFF_Parser* parser )
static FT_Error
cff_parse_private_dict( CFF_Parser* parser )
{
CFF_Font_Dict* dict = (CFF_Font_Dict*)parser->object;
FT_Byte** data = parser->stack;
@ -403,8 +403,8 @@
}
static
FT_Error cff_parse_cid_ros( CFF_Parser* parser )
static FT_Error
cff_parse_cid_ros( CFF_Parser* parser )
{
CFF_Font_Dict* dict = (CFF_Font_Dict*)parser->object;
FT_Byte** data = parser->stack;
@ -479,10 +479,10 @@
};
FT_LOCAL_DEF
FT_Error CFF_Parser_Run( CFF_Parser* parser,
FT_Byte* start,
FT_Byte* limit )
FT_LOCAL_DEF FT_Error
CFF_Parser_Run( CFF_Parser* parser,
FT_Byte* start,
FT_Byte* limit )
{
FT_Byte* p = start;
FT_Error error = CFF_Err_Ok;

16
src/cff/cffparse.h
View File

@ -49,15 +49,15 @@ FT_BEGIN_HEADER
} CFF_Parser;
FT_LOCAL
void CFF_Parser_Init( CFF_Parser* parser,
FT_UInt code,
void* object );
FT_LOCAL void
CFF_Parser_Init( CFF_Parser* parser,
FT_UInt code,
void* object );
FT_LOCAL
FT_Error CFF_Parser_Run( CFF_Parser* parser,
FT_Byte* start,
FT_Byte* limit );
FT_LOCAL FT_Error
CFF_Parser_Run( CFF_Parser* parser,
FT_Byte* start,
FT_Byte* limit );
FT_END_HEADER

18
src/cid/cidgload.c
View File

@ -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;

16
src/cid/cidgload.h
View File

@ -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

61
src/cid/cidload.c
View File

@ -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;

18
src/cid/cidload.h
View File

@ -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

24
src/cid/cidobjs.c
View File

@ -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 );
}

24
src/cid/cidobjs.h
View File

@ -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

14
src/cid/cidparse.c
View File

@ -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 )

16
src/cid/cidparse.h
View File

@ -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 );
/*************************************************************************/

25
src/cid/cidriver.c
View File

@ -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;
}

10
src/pcf/pcf.h
View File

@ -160,8 +160,8 @@ FT_BEGIN_HEADER
/* XXX hack */
FT_LOCAL
FT_Error PCF_Done_Face( PCF_Face face );
FT_LOCAL FT_Error
PCF_Done_Face( PCF_Face face );
/* macros for pcf font format */
@ -226,9 +226,9 @@ FT_BEGIN_HEADER
#define GLYPHPADOPTIONS 4 /* I'm not sure about this */
FT_LOCAL
FT_Error pcf_load_font( FT_Stream,
PCF_Face );
FT_LOCAL FT_Error
pcf_load_font( FT_Stream,
PCF_Face );
FT_END_HEADER

39
src/pcf/pcfdriver.c
View File

@ -48,8 +48,8 @@ THE SOFTWARE.
#define FT_COMPONENT trace_pcfdriver
FT_LOCAL_DEF
FT_Error PCF_Done_Face( PCF_Face face )
FT_LOCAL_DEF FT_Error
PCF_Done_Face( PCF_Face face )
{
FT_Memory memory = FT_FACE_MEMORY( face );
PCF_Property tmp = face->properties;
@ -73,12 +73,12 @@ THE SOFTWARE.
}
static
FT_Error PCF_Init_Face( FT_Stream stream,
PCF_Face face,
FT_Int face_index,
FT_Int num_params,
FT_Parameter* params )
static FT_Error
PCF_Init_Face( FT_Stream stream,
PCF_Face face,
FT_Int face_index,
FT_Int num_params,
FT_Parameter* params )
{
FT_Error error = PCF_Err_Ok;
@ -101,8 +101,8 @@ THE SOFTWARE.
}
static
FT_Error PCF_Set_Pixel_Size( FT_Size size )
static FT_Error
PCF_Set_Pixel_Size( FT_Size size )
{
PCF_Face face = (PCF_Face)FT_SIZE_FACE( size );
@ -130,11 +130,11 @@ THE SOFTWARE.
}
static
FT_Error PCF_Load_Glyph( FT_GlyphSlot slot,
FT_Size size,
FT_UInt glyph_index,
FT_Int load_flags )
static FT_Error
PCF_Load_Glyph( FT_GlyphSlot slot,
FT_Size size,
FT_UInt glyph_index,
FT_Int load_flags )
{
PCF_Face face = (PCF_Face)FT_SIZE_FACE( size );
FT_Error error = PCF_Err_Ok;
@ -241,9 +241,9 @@ THE SOFTWARE.
}
static
FT_UInt PCF_Get_Char_Index( FT_CharMap charmap,
FT_Long char_code )
static FT_UInt
PCF_Get_Char_Index( FT_CharMap charmap,
FT_Long char_code )
{
PCF_Face face = (PCF_Face)charmap->face;
PCF_Encoding en_table = face->encodings;
@ -332,7 +332,8 @@ THE SOFTWARE.
/* 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 &pcf_driver_class;
}

95
src/pcf/pcfread.c
View File

@ -38,6 +38,7 @@ THE SOFTWARE.
#include <string.h> /* strlen(), strcpy() */
/*************************************************************************/
/* */
/* The macro FT_COMPONENT is used in trace mode. It is an implicit */
@ -85,9 +86,9 @@ THE SOFTWARE.
};
static
FT_Error pcf_read_TOC( FT_Stream stream,
PCF_Face face )
static FT_Error
pcf_read_TOC( FT_Stream stream,
PCF_Face face )
{
FT_Error error;
PCF_Toc toc = &face->toc;
@ -198,10 +199,10 @@ THE SOFTWARE.
};
static
FT_Error pcf_parse_metric( FT_Stream stream,
const FT_Frame_Field* header,
PCF_Metric metric )
static FT_Error
pcf_parse_metric( FT_Stream stream,
const FT_Frame_Field* header,
PCF_Metric metric )
{
FT_Error error = PCF_Err_Ok;
@ -213,9 +214,9 @@ THE SOFTWARE.
}
static
FT_Error pcf_parse_compressed_metric( FT_Stream stream,
PCF_Metric metric )
static FT_Error
pcf_parse_compressed_metric( FT_Stream stream,
PCF_Metric metric )
{
PCF_Compressed_MetricRec compr_metric;
FT_Error error = PCF_Err_Ok;
@ -240,10 +241,10 @@ THE SOFTWARE.
}
static
FT_Error pcf_get_metric( FT_Stream stream,
FT_ULong format,
PCF_Metric metric )
static FT_Error
pcf_get_metric( FT_Stream stream,
FT_ULong format,
PCF_Metric metric )
{
FT_Error error = PCF_Err_Ok;
@ -262,13 +263,13 @@ THE SOFTWARE.
}
static
FT_Error pcfSeekToType( FT_Stream stream,
PCF_Table tables,
int ntables,
FT_ULong type,
FT_ULong* formatp,
FT_ULong* sizep )
static FT_Error
pcfSeekToType( FT_Stream stream,
PCF_Table tables,
int ntables,
FT_ULong type,
FT_ULong* formatp,
FT_ULong* sizep )
{
FT_Error error;
int i;
@ -290,10 +291,10 @@ THE SOFTWARE.
}
static
FT_Bool pcfHasType( PCF_Table tables,
int ntables,
FT_ULong type )
static FT_Bool
pcfHasType( PCF_Table tables,
int ntables,
FT_ULong type )
{
int i;
@ -334,9 +335,9 @@ THE SOFTWARE.
};
static
PCF_Property find_property( PCF_Face face,
const FT_String* prop )
static PCF_Property
find_property( PCF_Face face,
const FT_String* prop )
{
PCF_Property properties = face->properties;
FT_Bool found = 0;
@ -356,9 +357,9 @@ THE SOFTWARE.
}
static
FT_Error pcf_get_properties( FT_Stream stream,
PCF_Face face )
static FT_Error
pcf_get_properties( FT_Stream stream,
PCF_Face face )
{
PCF_ParseProperty props = 0;
PCF_Property properties = 0;
@ -482,9 +483,9 @@ THE SOFTWARE.
}
static
FT_Error pcf_get_metrics( FT_Stream stream,
PCF_Face face )
static FT_Error
pcf_get_metrics( FT_Stream stream,
PCF_Face face )
{
FT_Error error = PCF_Err_Ok;
FT_Memory memory = FT_FACE(face)->memory;
@ -559,9 +560,9 @@ THE SOFTWARE.
}
static
FT_Error pcf_get_bitmaps( FT_Stream stream,
PCF_Face face )
static FT_Error
pcf_get_bitmaps( FT_Stream stream,
PCF_Face face )
{
FT_Error error = PCF_Err_Ok;
FT_Memory memory = FT_FACE(face)->memory;
@ -649,9 +650,9 @@ THE SOFTWARE.
}
static
FT_Error pcf_get_encodings( FT_Stream stream,
PCF_Face face )
static FT_Error
pcf_get_encodings( FT_Stream stream,
PCF_Face face )
{
FT_Error error = PCF_Err_Ok;
FT_Memory memory = FT_FACE(face)->memory;
@ -799,10 +800,10 @@ THE SOFTWARE.
};
static
FT_Error pcf_get_accel( FT_Stream stream,
PCF_Face face,
FT_ULong type )
static FT_Error
pcf_get_accel( FT_Stream stream,
PCF_Face face,
FT_ULong type )
{
FT_ULong format, size;
FT_Error error = PCF_Err_Ok;
@ -862,9 +863,9 @@ THE SOFTWARE.
}
FT_LOCAL_DEF
FT_Error pcf_load_font( FT_Stream stream,
PCF_Face face )
FT_LOCAL_DEF FT_Error
pcf_load_font( FT_Stream stream,
PCF_Face face )
{
FT_Error error = PCF_Err_Ok;
FT_Memory memory = FT_FACE(face)->memory;

28
src/pcf/pcfutil.c
View File

@ -72,8 +72,9 @@ in this Software without prior written authorization from The Open Group.
* Invert bit order within each BYTE of an array.
*/
void BitOrderInvert( unsigned char* buf,
int nbytes )
void
BitOrderInvert( unsigned char* buf,
int nbytes )
{
const unsigned char* rev = _reverse_byte;
@ -87,8 +88,9 @@ in this Software without prior written authorization from The Open Group.
* Invert byte order within each 16-bits of an array.
*/
void TwoByteSwap( unsigned char* buf,
int nbytes )
void
TwoByteSwap( unsigned char* buf,
int nbytes )
{
unsigned char c;
@ -105,8 +107,9 @@ in this Software without prior written authorization from The Open Group.
* Invert byte order within each 32-bits of an array.
*/
void FourByteSwap( unsigned char* buf,
int nbytes )
void
FourByteSwap( unsigned char* buf,
int nbytes )
{
unsigned char c;
@ -128,12 +131,13 @@ in this Software without prior written authorization from The Open Group.
* Repad a bitmap.
*/
int RepadBitmap( char* pSrc,
char* pDst,
unsigned int srcPad,
unsigned int dstPad,
int width,
int height )
int
RepadBitmap( char* pSrc,
char* pDst,
unsigned int srcPad,
unsigned int dstPad,
int width,
int height )
{
int srcWidthBytes, dstWidthBytes;
int row, col;

28
src/pcf/pcfutil.h
View File

@ -32,21 +32,25 @@ THE SOFTWARE.
#include <ft2build.h>
void BitOrderInvert( unsigned char* buf,
int nbytes);
void
BitOrderInvert( unsigned char* buf,
int nbytes);
void TwoByteSwap ( unsigned char* buf,
int nbytes);
void
TwoByteSwap( unsigned char* buf,
int nbytes);
void FourByteSwap ( unsigned char* buf,
int nbytes);
void
FourByteSwap( unsigned char* buf,
int nbytes);
int RepadBitmap ( char* pSrc,
char* pDst,
unsigned int srcPad,
unsigned int dstPad,
int width,
int height);
int
RepadBitmap( char* pSrc,
char* pDst,
unsigned int srcPad,
unsigned int dstPad,
int width,
int height);
#endif /* __PCFUTIL_H__ */

248
src/psaux/psobjs.c
View File

@ -53,10 +53,10 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
FT_LOCAL_DEF
FT_Error PS_Table_New( PS_Table* table,
FT_Int count,
FT_Memory memory )
FT_LOCAL_DEF FT_Error
PS_Table_New( PS_Table* table,
FT_Int count,
FT_Memory memory )
{
FT_Error error;
@ -82,9 +82,9 @@
}
static
void shift_elements( PS_Table* table,
FT_Byte* old_base )
static void
shift_elements( PS_Table* table,
FT_Byte* old_base )
{
FT_Long delta = (FT_Long)( table->block - old_base );
FT_Byte** offset = table->elements;
@ -99,9 +99,9 @@
}
static
FT_Error reallocate_t1_table( PS_Table* table,
FT_Int new_size )
static FT_Error
reallocate_t1_table( PS_Table* table,
FT_Int new_size )
{
FT_Memory memory = table->memory;
FT_Byte* old_base = table->block;
@ -148,11 +148,11 @@
/* FreeType error code. 0 means success. An error is returned if a */
/* reallocation fails. */
/* */
FT_LOCAL_DEF
FT_Error PS_Table_Add( PS_Table* table,
FT_Int index,
void* object,
FT_Int length )
FT_LOCAL_DEF FT_Error
PS_Table_Add( PS_Table* table,
FT_Int index,
void* object,
FT_Int length )
{
if ( index < 0 || index > table->max_elems )
{
@ -200,8 +200,8 @@
/* This function does NOT release the heap's memory block. It is up */
/* to the caller to clean it, or reference it in its own structures. */
/* */
FT_LOCAL_DEF
void PS_Table_Done( PS_Table* table )
FT_LOCAL_DEF void
PS_Table_Done( PS_Table* table )
{
FT_Memory memory = table->memory;
FT_Error error;
@ -222,8 +222,8 @@
}
FT_LOCAL_DEF
void PS_Table_Release( PS_Table* table )
FT_LOCAL_DEF void
PS_Table_Release( PS_Table* table )
{
FT_Memory memory = table->memory;
@ -253,8 +253,8 @@
#define IS_T1_SPACE( c ) ( IS_T1_WHITESPACE( c ) || IS_T1_LINESPACE( c ) )
FT_LOCAL_DEF
void T1_Skip_Spaces( T1_Parser* parser )
FT_LOCAL_DEF void
T1_Skip_Spaces( T1_Parser* parser )
{
FT_Byte* cur = parser->cursor;
FT_Byte* limit = parser->limit;
@ -273,8 +273,8 @@
}
FT_LOCAL_DEF
void T1_Skip_Alpha( T1_Parser* parser )
FT_LOCAL_DEF void
T1_Skip_Alpha( T1_Parser* parser )
{
FT_Byte* cur = parser->cursor;
FT_Byte* limit = parser->limit;
@ -293,9 +293,9 @@
}
FT_LOCAL_DEF
void T1_ToToken( T1_Parser* parser,
T1_Token* token )
FT_LOCAL_DEF void
T1_ToToken( T1_Parser* parser,
T1_Token* token )
{
FT_Byte* cur;
FT_Byte* limit;
@ -376,11 +376,11 @@
}
FT_LOCAL_DEF
void T1_ToTokenArray( T1_Parser* parser,
T1_Token* tokens,
FT_UInt max_tokens,
FT_Int* pnum_tokens )
FT_LOCAL_DEF void
T1_ToTokenArray( T1_Parser* parser,
T1_Token* tokens,
FT_UInt max_tokens,
FT_Int* pnum_tokens )
{
T1_Token master;
@ -422,9 +422,9 @@
}
static
FT_Long t1_toint( FT_Byte** cursor,
FT_Byte* limit )
static FT_Long
t1_toint( FT_Byte** cursor,
FT_Byte* limit )
{
FT_Long result = 0;
FT_Byte* cur = *cursor;
@ -467,10 +467,10 @@
}
static
FT_Long t1_tofixed( FT_Byte** cursor,
FT_Byte* limit,
FT_Long power_ten )
static FT_Long
t1_tofixed( FT_Byte** cursor,
FT_Byte* limit,
FT_Long power_ten )
{
FT_Byte* cur = *cursor;
FT_Long num, divider, result;
@ -557,11 +557,11 @@
}
static
FT_Int t1_tocoordarray( FT_Byte** cursor,
FT_Byte* limit,
FT_Int max_coords,
FT_Short* coords )
static FT_Int
t1_tocoordarray( FT_Byte** cursor,
FT_Byte* limit,
FT_Int max_coords,
FT_Short* coords )
{
FT_Byte* cur = *cursor;
FT_Int count = 0;
@ -616,12 +616,12 @@
}
static
FT_Int t1_tofixedarray( FT_Byte** cursor,
FT_Byte* limit,
FT_Int max_values,
FT_Fixed* values,
FT_Int power_ten )
static FT_Int
t1_tofixedarray( FT_Byte** cursor,
FT_Byte* limit,
FT_Int max_values,
FT_Fixed* values,
FT_Int power_ten )
{
FT_Byte* cur = *cursor;
FT_Int count = 0;
@ -677,10 +677,10 @@
#if 0
static
FT_String* t1_tostring( FT_Byte** cursor,
FT_Byte* limit,
FT_Memory memory )
static FT_String*
t1_tostring( FT_Byte** cursor,
FT_Byte* limit,
FT_Memory memory )
{
FT_Byte* cur = *cursor;
FT_Int len = 0;
@ -737,9 +737,9 @@
#endif /* 0 */
static
int t1_tobool( FT_Byte** cursor,
FT_Byte* limit )
static int
t1_tobool( FT_Byte** cursor,
FT_Byte* limit )
{
FT_Byte* cur = *cursor;
FT_Bool result = 0;
@ -772,12 +772,12 @@
/* Load a simple field (i.e. non-table) into the current list of objects */
FT_LOCAL_DEF
FT_Error T1_Load_Field( T1_Parser* parser,
const T1_Field* field,
void** objects,
FT_UInt max_objects,
FT_ULong* pflags )
FT_LOCAL_DEF FT_Error
T1_Load_Field( T1_Parser* parser,
const T1_Field* field,
void** objects,
FT_UInt max_objects,
FT_ULong* pflags )
{
T1_Token token;
FT_Byte* cur;
@ -893,12 +893,12 @@
#define T1_MAX_TABLE_ELEMENTS 32
FT_LOCAL_DEF
FT_Error T1_Load_Field_Table( T1_Parser* parser,
const T1_Field* field,
void** objects,
FT_UInt max_objects,
FT_ULong* pflags )
FT_LOCAL_DEF FT_Error
T1_Load_Field_Table( T1_Parser* parser,
const T1_Field* field,
void** objects,
FT_UInt max_objects,
FT_ULong* pflags )
{
T1_Token elements[T1_MAX_TABLE_ELEMENTS];
T1_Token* token;
@ -957,36 +957,36 @@
}
FT_LOCAL_DEF
FT_Long T1_ToInt( T1_Parser* parser )
FT_LOCAL_DEF FT_Long
T1_ToInt( T1_Parser* parser )
{
return t1_toint( &parser->cursor, parser->limit );
}
FT_LOCAL_DEF
FT_Fixed T1_ToFixed( T1_Parser* parser,
FT_Int power_ten )
FT_LOCAL_DEF FT_Fixed
T1_ToFixed( T1_Parser* parser,
FT_Int power_ten )
{
return t1_tofixed( &parser->cursor, parser->limit, power_ten );
}
FT_LOCAL_DEF
FT_Int T1_ToCoordArray( T1_Parser* parser,
FT_Int max_coords,
FT_Short* coords )
FT_LOCAL_DEF FT_Int
T1_ToCoordArray( T1_Parser* parser,
FT_Int max_coords,
FT_Short* coords )
{
return t1_tocoordarray( &parser->cursor, parser->limit,
max_coords, coords );
}
FT_LOCAL_DEF
FT_Int T1_ToFixedArray( T1_Parser* parser,
FT_Int max_values,
FT_Fixed* values,
FT_Int power_ten )
FT_LOCAL_DEF FT_Int
T1_ToFixedArray( T1_Parser* parser,
FT_Int max_values,
FT_Fixed* values,
FT_Int power_ten )
{
return t1_tofixedarray( &parser->cursor, parser->limit,
max_values, values, power_ten );
@ -995,15 +995,15 @@
#if 0
FT_LOCAL_DEF
FT_String* T1_ToString( T1_Parser* parser )
FT_LOCAL_DEF FT_String*
T1_ToString( T1_Parser* parser )
{
return t1_tostring( &parser->cursor, parser->limit, parser->memory );
}
FT_LOCAL_DEF
FT_Bool T1_ToBool( T1_Parser* parser )
FT_LOCAL_DEF FT_Bool
T1_ToBool( T1_Parser* parser )
{
return t1_tobool( &parser->cursor, parser->limit );
}
@ -1011,11 +1011,11 @@
#endif /* 0 */
FT_LOCAL_DEF
void T1_Init_Parser( T1_Parser* parser,
FT_Byte* base,
FT_Byte* limit,
FT_Memory memory )
FT_LOCAL_DEF void
T1_Init_Parser( T1_Parser* parser,
FT_Byte* base,
FT_Byte* limit,
FT_Memory memory )
{
parser->error = 0;
parser->base = base;
@ -1026,8 +1026,8 @@
}
FT_LOCAL_DEF
void T1_Done_Parser( T1_Parser* parser )
FT_LOCAL_DEF void
T1_Done_Parser( T1_Parser* parser )
{
FT_UNUSED( parser );
}
@ -1059,11 +1059,11 @@
/* */
/* glyph :: The current glyph object. */
/* */
FT_LOCAL_DEF
void T1_Builder_Init( T1_Builder* builder,
FT_Face face,
FT_Size size,
FT_GlyphSlot glyph )
FT_LOCAL_DEF void
T1_Builder_Init( T1_Builder* builder,
FT_Face face,
FT_Size size,
FT_GlyphSlot glyph )
{
builder->path_begun = 0;
builder->load_points = 1;
@ -1114,8 +1114,8 @@
/* <Input> */
/* builder :: A pointer to the glyph builder to finalize. */
/* */
FT_LOCAL_DEF
void T1_Builder_Done( T1_Builder* builder )
FT_LOCAL_DEF void
T1_Builder_Done( T1_Builder* builder )
{
FT_GlyphSlot glyph = builder->glyph;
@ -1126,20 +1126,20 @@
/* check that there is enough room for `count' more points */
FT_LOCAL_DEF
FT_Error T1_Builder_Check_Points( T1_Builder* builder,
FT_Int count )
FT_LOCAL_DEF FT_Error
T1_Builder_Check_Points( T1_Builder* builder,
FT_Int count )
{
return FT_GlyphLoader_Check_Points( builder->loader, count, 0 );
}
/* add a new point, do not check space */
FT_LOCAL_DEF
void T1_Builder_Add_Point( T1_Builder* builder,
FT_Pos x,
FT_Pos y,
FT_Byte flag )
FT_LOCAL_DEF void
T1_Builder_Add_Point( T1_Builder* builder,
FT_Pos x,
FT_Pos y,
FT_Byte flag )
{
FT_Outline* outline = builder->current;
@ -1166,10 +1166,10 @@
/* check space for a new on-curve point, then add it */
FT_LOCAL_DEF
FT_Error T1_Builder_Add_Point1( T1_Builder* builder,
FT_Pos x,
FT_Pos y )
FT_LOCAL_DEF FT_Error
T1_Builder_Add_Point1( T1_Builder* builder,
FT_Pos x,
FT_Pos y )
{
FT_Error error;
@ -1183,8 +1183,8 @@
/* check room for a new contour, then add it */
FT_LOCAL_DEF
FT_Error T1_Builder_Add_Contour( T1_Builder* builder )
FT_LOCAL_DEF FT_Error
T1_Builder_Add_Contour( T1_Builder* builder )
{
FT_Outline* outline = builder->current;
FT_Error error;
@ -1211,10 +1211,10 @@
/* if a path was begun, add its first on-curve point */
FT_LOCAL_DEF
FT_Error T1_Builder_Start_Point( T1_Builder* builder,
FT_Pos x,
FT_Pos y )
FT_LOCAL_DEF FT_Error
T1_Builder_Start_Point( T1_Builder* builder,
FT_Pos x,
FT_Pos y )
{
FT_Error error = 0;
@ -1232,8 +1232,8 @@
/* close the current contour */
FT_LOCAL_DEF
void T1_Builder_Close_Contour( T1_Builder* builder )
FT_LOCAL_DEF void
T1_Builder_Close_Contour( T1_Builder* builder )
{
FT_Outline* outline = builder->current;
@ -1275,10 +1275,10 @@
/*************************************************************************/
/*************************************************************************/
FT_LOCAL_DEF
void T1_Decrypt( FT_Byte* buffer,
FT_Offset length,
FT_UShort seed )
FT_LOCAL_DEF void
T1_Decrypt( FT_Byte* buffer,
FT_Offset length,
FT_UShort seed )
{
while ( length > 0 )
{

178
src/psaux/psobjs.h
View File

@ -46,23 +46,23 @@ FT_BEGIN_HEADER
const T1_Builder_Funcs t1_builder_funcs;
FT_LOCAL
FT_Error PS_Table_New( PS_Table* table,
FT_Int count,
FT_Memory memory );
FT_LOCAL FT_Error
PS_Table_New( PS_Table* table,
FT_Int count,
FT_Memory memory );
FT_LOCAL
FT_Error PS_Table_Add( PS_Table* table,
FT_Int index,
void* object,
FT_Int length );
FT_LOCAL FT_Error
PS_Table_Add( PS_Table* table,
FT_Int index,
void* object,
FT_Int length );
FT_LOCAL
void PS_Table_Done( PS_Table* table );
FT_LOCAL void
PS_Table_Done( PS_Table* table );
FT_LOCAL
void PS_Table_Release( PS_Table* table );
FT_LOCAL void
PS_Table_Release( PS_Table* table );
/*************************************************************************/
@ -74,65 +74,65 @@ FT_BEGIN_HEADER
/*************************************************************************/
FT_LOCAL
void T1_Skip_Spaces( T1_Parser* parser );
FT_LOCAL void
T1_Skip_Spaces( T1_Parser* parser );
FT_LOCAL
void T1_Skip_Alpha( T1_Parser* parser );
FT_LOCAL void
T1_Skip_Alpha( T1_Parser* parser );
FT_LOCAL
void T1_ToToken( T1_Parser* parser,
T1_Token* token );
FT_LOCAL void
T1_ToToken( T1_Parser* parser,
T1_Token* token );
FT_LOCAL
void T1_ToTokenArray( T1_Parser* parser,
T1_Token* tokens,
FT_UInt max_tokens,
FT_Int* pnum_tokens );
FT_LOCAL void
T1_ToTokenArray( T1_Parser* parser,
T1_Token* tokens,
FT_UInt max_tokens,
FT_Int* pnum_tokens );
FT_LOCAL
FT_Error T1_Load_Field( T1_Parser* parser,
const T1_Field* field,
void** objects,
FT_UInt max_objects,
FT_ULong* pflags );
FT_LOCAL FT_Error
T1_Load_Field( T1_Parser* parser,
const T1_Field* field,
void** objects,
FT_UInt max_objects,
FT_ULong* pflags );
FT_LOCAL
FT_Error T1_Load_Field_Table( T1_Parser* parser,
const T1_Field* field,
void** objects,
FT_UInt max_objects,
FT_ULong* pflags );
FT_LOCAL FT_Error
T1_Load_Field_Table( T1_Parser* parser,
const T1_Field* field,
void** objects,
FT_UInt max_objects,
FT_ULong* pflags );
FT_LOCAL
FT_Long T1_ToInt( T1_Parser* parser );
FT_LOCAL FT_Long
T1_ToInt( T1_Parser* parser );
FT_LOCAL
FT_Fixed T1_ToFixed( T1_Parser* parser,
FT_Int power_ten );
FT_LOCAL FT_Fixed
T1_ToFixed( T1_Parser* parser,
FT_Int power_ten );
FT_LOCAL
FT_Int T1_ToCoordArray( T1_Parser* parser,
FT_Int max_coords,
FT_Short* coords );
FT_LOCAL FT_Int
T1_ToCoordArray( T1_Parser* parser,
FT_Int max_coords,
FT_Short* coords );
FT_LOCAL
FT_Int T1_ToFixedArray( T1_Parser* parser,
FT_Int max_values,
FT_Fixed* values,
FT_Int power_ten );
FT_LOCAL FT_Int
T1_ToFixedArray( T1_Parser* parser,
FT_Int max_values,
FT_Fixed* values,
FT_Int power_ten );
FT_LOCAL
void T1_Init_Parser( T1_Parser* parser,
FT_Byte* base,
FT_Byte* limit,
FT_Memory memory );
FT_LOCAL void
T1_Init_Parser( T1_Parser* parser,
FT_Byte* base,
FT_Byte* limit,
FT_Memory memory );
FT_LOCAL
void T1_Done_Parser( T1_Parser* parser );
FT_LOCAL void
T1_Done_Parser( T1_Parser* parser );
/*************************************************************************/
@ -143,42 +143,42 @@ FT_BEGIN_HEADER
/*************************************************************************/
/*************************************************************************/
FT_LOCAL
void T1_Builder_Init( T1_Builder* builder,
FT_Face face,
FT_Size size,
FT_GlyphSlot glyph );
FT_LOCAL void
T1_Builder_Init( T1_Builder* builder,
FT_Face face,
FT_Size size,
FT_GlyphSlot glyph );
FT_LOCAL
void T1_Builder_Done( T1_Builder* builder );
FT_LOCAL void
T1_Builder_Done( T1_Builder* builder );
FT_LOCAL
FT_Error T1_Builder_Check_Points( T1_Builder* builder,
FT_Int count );
FT_LOCAL FT_Error
T1_Builder_Check_Points( T1_Builder* builder,
FT_Int count );
FT_LOCAL
void T1_Builder_Add_Point( T1_Builder* builder,
FT_Pos x,
FT_Pos y,
FT_Byte flag );
FT_LOCAL void
T1_Builder_Add_Point( T1_Builder* builder,
FT_Pos x,
FT_Pos y,
FT_Byte flag );
FT_LOCAL
FT_Error T1_Builder_Add_Point1( T1_Builder* builder,
FT_Pos x,
FT_Pos y );
FT_LOCAL FT_Error
T1_Builder_Add_Point1( T1_Builder* builder,
FT_Pos x,
FT_Pos y );
FT_LOCAL
FT_Error T1_Builder_Add_Contour( T1_Builder* builder );
FT_LOCAL FT_Error
T1_Builder_Add_Contour( T1_Builder* builder );
FT_LOCAL
FT_Error T1_Builder_Start_Point( T1_Builder* builder,
FT_Pos x,
FT_Pos y );
FT_LOCAL FT_Error
T1_Builder_Start_Point( T1_Builder* builder,
FT_Pos x,
FT_Pos y );
FT_LOCAL
void T1_Builder_Close_Contour( T1_Builder* builder );
FT_LOCAL void
T1_Builder_Close_Contour( T1_Builder* builder );
/*************************************************************************/
@ -189,10 +189,10 @@ FT_BEGIN_HEADER
/*************************************************************************/
/*************************************************************************/
FT_LOCAL
void T1_Decrypt( FT_Byte* buffer,
FT_Offset length,
FT_UShort seed );
FT_LOCAL void
T1_Decrypt( FT_Byte* buffer,
FT_Offset length,
FT_UShort seed );
FT_END_HEADER

54
src/psaux/t1decode.c
View File

@ -119,9 +119,9 @@
/* A glyph index in the font face. Returns -1 if the corresponding */
/* glyph wasn't found. */
/* */
static
FT_Int t1_lookup_glyph_by_stdcharcode( T1_Decoder* decoder,
FT_Int charcode )
static FT_Int
t1_lookup_glyph_by_stdcharcode( T1_Decoder* decoder,
FT_Int charcode )
{
FT_UInt n;
const FT_String* glyph_name;
@ -172,13 +172,13 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
static
FT_Error t1operator_seac( T1_Decoder* decoder,
FT_Pos asb,
FT_Pos adx,
FT_Pos ady,
FT_Int bchar,
FT_Int achar )
static FT_Error
t1operator_seac( T1_Decoder* decoder,
FT_Pos asb,
FT_Pos adx,
FT_Pos ady,
FT_Int bchar,
FT_Int achar )
{
FT_Error error;
FT_Int bchar_index, achar_index, n_base_points;
@ -313,10 +313,10 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
FT_LOCAL_DEF
FT_Error T1_Decoder_Parse_Charstrings( T1_Decoder* decoder,
FT_Byte* charstring_base,
FT_UInt charstring_len )
FT_LOCAL_DEF FT_Error
T1_Decoder_Parse_Charstrings( T1_Decoder* decoder,
FT_Byte* charstring_base,
FT_UInt charstring_len )
{
FT_Error error;
T1_Decoder_Zone* zone;
@ -1024,22 +1024,22 @@
}
FT_LOCAL_DEF
FT_Error T1_Decoder_Parse_Glyph( T1_Decoder* decoder,
FT_UInt glyph )
FT_LOCAL_DEF FT_Error
T1_Decoder_Parse_Glyph( T1_Decoder* decoder,
FT_UInt glyph )
{
return decoder->parse_callback( decoder, glyph );
}
FT_LOCAL_DEF
FT_Error T1_Decoder_Init( T1_Decoder* decoder,
FT_Face face,
FT_Size size,
FT_GlyphSlot slot,
FT_Byte** glyph_names,
T1_Blend* blend,
T1_Decoder_Callback parse_callback )
FT_LOCAL_DEF FT_Error
T1_Decoder_Init( T1_Decoder* decoder,
FT_Face face,
FT_Size size,
FT_GlyphSlot slot,
FT_Byte** glyph_names,
T1_Blend* blend,
T1_Decoder_Callback parse_callback )
{
MEM_Set( decoder, 0, sizeof ( *decoder ) );
@ -1072,8 +1072,8 @@
}
FT_LOCAL_DEF
void T1_Decoder_Done( T1_Decoder* decoder )
FT_LOCAL_DEF void
T1_Decoder_Done( T1_Decoder* decoder )
{
T1_Builder_Done( &decoder->builder );
}

34
src/psaux/t1decode.h
View File

@ -33,26 +33,26 @@ FT_BEGIN_HEADER
const T1_Decoder_Funcs t1_decoder_funcs;
FT_LOCAL
FT_Error T1_Decoder_Parse_Glyph( T1_Decoder* decoder,
FT_UInt glyph_index );
FT_LOCAL FT_Error
T1_Decoder_Parse_Glyph( T1_Decoder* decoder,
FT_UInt glyph_index );
FT_LOCAL
FT_Error T1_Decoder_Parse_Charstrings( T1_Decoder* decoder,
FT_Byte* base,
FT_UInt len );
FT_LOCAL FT_Error
T1_Decoder_Parse_Charstrings( T1_Decoder* decoder,
FT_Byte* base,
FT_UInt len );
FT_LOCAL
FT_Error T1_Decoder_Init( T1_Decoder* decoder,
FT_Face face,
FT_Size size,
FT_GlyphSlot slot,
FT_Byte** glyph_names,
T1_Blend* blend,
T1_Decoder_Callback parse_glyph );
FT_LOCAL FT_Error
T1_Decoder_Init( T1_Decoder* decoder,
FT_Face face,
FT_Size size,
FT_GlyphSlot slot,
FT_Byte** glyph_names,
T1_Blend* blend,
T1_Decoder_Callback parse_glyph );
FT_LOCAL
void T1_Decoder_Done( T1_Decoder* decoder );
FT_LOCAL void
T1_Decoder_Done( T1_Decoder* decoder );
FT_END_HEADER