ref: 93616ecb6601b133f9f33082c05d2675a556a001
parent: 99b744164d3e4887f39e1cea28088d21d4ad6a4e
author: Werner Lemberg <[email protected]>
date: Wed Jun 27 15:46:12 EDT 2001
next round in function header formatting
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -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;
}
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -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,9 +383,9 @@
/* 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 );
}
@@ -392,11 +392,11 @@
/* 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;
--- a/src/cff/cffgload.h
+++ b/src/cff/cffgload.h
@@ -164,35 +164,35 @@
} 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
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -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;
--- a/src/cff/cffload.h
+++ b/src/cff/cffload.h
@@ -33,39 +33,39 @@
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
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -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 */
--- a/src/cff/cffobjs.h
+++ b/src/cff/cffobjs.h
@@ -113,15 +113,15 @@
/* */
/* 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 );
/*************************************************************************/
@@ -128,11 +128,11 @@
/* */
/* 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
--- a/src/cff/cffparse.c
+++ b/src/cff/cffparse.c
@@ -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,8 +302,8 @@
/* 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 )
@@ -310,8 +310,8 @@
: (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;
--- a/src/cff/cffparse.h
+++ b/src/cff/cffparse.h
@@ -49,15 +49,15 @@
} 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
--- 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;
--- a/src/cid/cidgload.h
+++ b/src/cid/cidgload.h
@@ -30,17 +30,17 @@
#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
--- 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;
--- a/src/cid/cidload.h
+++ b/src/cid/cidload.h
@@ -36,17 +36,17 @@
} 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
--- 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 );
}
--- a/src/cid/cidobjs.h
+++ b/src/cid/cidobjs.h
@@ -111,22 +111,22 @@
} 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
--- 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 )
--- a/src/cid/cidparse.h
+++ b/src/cid/cidparse.h
@@ -55,7 +55,7 @@
/* */
/* 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 @@
} 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 );
/*************************************************************************/
--- 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;
}
--- a/src/pcf/pcf.c
+++ b/src/pcf/pcf.c
@@ -1,9 +1,9 @@
-/* pcf.c
+/* pcf.c
FreeType font driver for pcf fonts
- Copyright 2000 by
- Francesco Zappa Nardelli
+ Copyright 2000 by
+ Francesco Zappa Nardelli
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
--- a/src/pcf/pcf.h
+++ b/src/pcf/pcf.h
@@ -1,9 +1,9 @@
-/* pcf.h
+/* pcf.h
FreeType font driver for pcf fonts
- Copyright (C) 2000 by
- Francesco Zappa Nardelli
+ Copyright (C) 2000 by
+ Francesco Zappa Nardelli
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -45,7 +45,7 @@
} PCF_TableRec, *PCF_Table;
- typedef struct PCF_TocRec_
+ typedef struct PCF_TocRec_
{FT_ULong version;
FT_ULong count;
@@ -54,7 +54,7 @@
} PCF_TocRec, *PCF_Toc;
- typedef struct PCF_ParseProperty_
+ typedef struct PCF_ParseProperty_
{FT_Long name;
FT_Byte isString;
@@ -76,10 +76,10 @@
} value;
- } PCF_PropertyRec, *PCF_Property;
+ } PCF_PropertyRec, *PCF_Property;
- typedef struct PCF_Compressed_Metric_
+ typedef struct PCF_Compressed_Metric_
{FT_Byte leftSideBearing;
FT_Byte rightSideBearing;
@@ -88,9 +88,9 @@
FT_Byte descent;
} PCF_Compressed_MetricRec, *PCF_Compressed_Metric;
-
- typedef struct PCF_Metric_
+
+ typedef struct PCF_Metric_
{FT_Short leftSideBearing;
FT_Short rightSideBearing;
@@ -134,7 +134,7 @@
typedef struct PCF_FaceRec_
{FT_FaceRec root;
-
+
char* charset_encoding;
char* charset_registry;
@@ -148,7 +148,7 @@
PCF_Metric metrics;
FT_Long nencodings;
PCF_Encoding encodings;
-
+
FT_Short defaultChar;
FT_ULong bitmapsFormat;
@@ -160,8 +160,8 @@
/* 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 */
@@ -173,7 +173,7 @@
( 'c' << 16 ) | \
( 'f' << 8 ) | 1 )
#define PCF_FORMAT_MASK 0xFFFFFF00L
-
+
#define PCF_DEFAULT_FORMAT 0x00000000L
#define PCF_INKBOUNDS 0x00000200L
#define PCF_ACCEL_W_INKBOUNDS 0x00000100L
@@ -226,10 +226,10 @@
#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
--- a/src/pcf/pcfdriver.c
+++ b/src/pcf/pcfdriver.c
@@ -3,7 +3,7 @@
FreeType font driver for pcf files
Copyright (C) 2000 by
- Francesco Zappa Nardelli
+ Francesco Zappa Nardelli
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -48,15 +48,15 @@
#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;
int i;
- FREE( face->encodings );
+ FREE( face->encodings );
FREE( face->metrics );
for ( i = 0; i < face->nprops; i++ )
@@ -73,20 +73,20 @@
}
- 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;
-
+
FT_UNUSED( num_params );
FT_UNUSED( params );
FT_UNUSED( face_index );
-
+
error = pcf_load_font( stream, face );
if ( error )
goto Fail;
@@ -93,7 +93,7 @@
return PCF_Err_Ok;
- Fail:
+ Fail:
FT_TRACE2(( "[not a valid PCF file]\n" ));
PCF_Done_Face( face );
@@ -101,9 +101,9 @@
}
- 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 );
@@ -112,7 +112,7 @@
if ( size->metrics.y_ppem == face->root.available_sizes->height )
{- size->metrics.ascender = face->accel.fontAscent << 6;
+ size->metrics.ascender = face->accel.fontAscent << 6;
size->metrics.descender = face->accel.fontDescent * (-64);
#if 0
size->metrics.height = face->accel.maxbounds.ascent << 6;
@@ -119,7 +119,7 @@
#endif
size->metrics.height = size->metrics.ascender -
size->metrics.descender;
-
+
return PCF_Err_Ok;
}
else
@@ -130,12 +130,12 @@
}
- 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;
FT_Memory memory = FT_FACE(face)->memory;
@@ -157,12 +157,12 @@
}
metric = face->metrics + glyph_index;
-
+
bitmap->rows = metric->ascent + metric->descent;
bitmap->width = metric->rightSideBearing - metric->leftSideBearing;
bitmap->num_grays = 1;
bitmap->pixel_mode = ft_pixel_mode_mono;
-
+
FT_TRACE6(( "BIT_ORDER %d ; BYTE_ORDER %d ; GLYPH_PAD %d\n",
PCF_BIT_ORDER( face->bitmapsFormat ),
PCF_BYTE_ORDER( face->bitmapsFormat ),
@@ -170,7 +170,7 @@
switch ( PCF_GLYPH_PAD( face->bitmapsFormat ) )
{- case 1:
+ case 1:
bitmap->pitch = ( bitmap->width + 7 ) >> 3;
break;
@@ -178,12 +178,12 @@
bitmap->pitch = ( ( bitmap->width + 15 ) >> 4 ) << 1;
break;
- case 4:
+ case 4:
bitmap->pitch = ( ( bitmap->width + 31 ) >> 5 ) << 2;
break;
- case 8:
- bitmap->pitch = ( ( bitmap->width + 63 ) >> 6 ) << 3;
+ case 8:
+ bitmap->pitch = ( ( bitmap->width + 63 ) >> 6 ) << 3;
break;
default:
@@ -203,7 +203,7 @@
if ( PCF_BIT_ORDER( face->bitmapsFormat ) != MSBFirst )
BitOrderInvert( bitmap->buffer,bytes );
- if ( ( PCF_BYTE_ORDER( face->bitmapsFormat ) !=
+ if ( ( PCF_BYTE_ORDER( face->bitmapsFormat ) !=
PCF_BIT_ORDER( face->bitmapsFormat ) ) )
{switch ( PCF_SCAN_UNIT( face->bitmapsFormat ) )
@@ -229,7 +229,7 @@
slot->metrics.horiBearingY = metric->ascent << 6 ;
slot->metrics.width = metric->characterWidth << 6 ;
slot->metrics.height = bitmap->rows << 6;
-
+
slot->linearHoriAdvance = (FT_Fixed)bitmap->width << 16;
slot->format = ft_glyph_format_bitmap;
slot->flags = ft_glyph_own_bitmap;
@@ -237,14 +237,14 @@
FT_TRACE4(( " --- ok\n" ));
Exit:
- return error;
+ return error;
}
- 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;
int low, high, mid;
@@ -264,7 +264,7 @@
else
return en_table[mid].glyph;
}
-
+
return 0;
}
@@ -275,22 +275,22 @@
{ft_module_font_driver,
sizeof ( FT_DriverRec ),
-
+
"pcf",
0x10000L,
0x20000L,
-
+
0,
-
+
(FT_Module_Constructor)0,
(FT_Module_Destructor) 0,
(FT_Module_Requester) 0
},
-
+
sizeof( PCF_FaceRec ),
sizeof( FT_SizeRec ),
sizeof( FT_GlyphSlotRec ),
-
+
(FTDriver_initFace) PCF_Init_Face,
(FTDriver_doneFace) PCF_Done_Face,
(FTDriver_initSize) 0,
@@ -297,13 +297,13 @@
(FTDriver_doneSize) 0,
(FTDriver_initGlyphSlot)0,
(FTDriver_doneGlyphSlot)0,
-
+
(FTDriver_setCharSizes) PCF_Set_Pixel_Size,
(FTDriver_setPixelSizes)PCF_Set_Pixel_Size,
(FTDriver_loadGlyph) PCF_Load_Glyph,
(FTDriver_getCharIndex) PCF_Get_Char_Index,
-
+
(FTDriver_getKerning) 0,
(FTDriver_attachFile) 0,
(FTDriver_getAdvances) 0
@@ -332,7 +332,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 &pcf_driver_class;
}
--- a/src/pcf/pcfdriver.h
+++ b/src/pcf/pcfdriver.h
@@ -1,9 +1,9 @@
-/* pcfdriver.h
+/* pcfdriver.h
FreeType font driver for pcf fonts
- Copyright 2000 by
- Francesco Zappa Nardelli
+ Copyright 2000 by
+ Francesco Zappa Nardelli
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@@ -1,9 +1,9 @@
-/* pcfread.c
+/* pcfread.c
FreeType font driver for pcf fonts
- Copyright 2000 by
- Francesco Zappa Nardelli
+ Copyright 2000 by
+ Francesco Zappa Nardelli
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -38,6 +38,7 @@
#include <string.h> /* strlen(), strcpy() */
+
/*************************************************************************/
/* */
/* The macro FT_COMPONENT is used in trace mode. It is an implicit */
@@ -57,7 +58,7 @@
#endif
- static
+ static
const FT_Frame_Field pcf_toc_header[] =
{#undef FT_STRUCTURE
@@ -70,7 +71,7 @@
};
- static
+ static
const FT_Frame_Field pcf_table_header[] =
{#undef FT_STRUCTURE
@@ -85,9 +86,9 @@
};
- 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;
@@ -100,7 +101,7 @@
if ( FILE_Seek ( 0 ) ||
READ_Fields ( pcf_toc_header, toc ) )
return PCF_Err_Cannot_Open_Resource;
-
+
if ( toc->version != PCF_FILE_VERSION )
return PCF_Err_Invalid_File_Format;
@@ -133,7 +134,7 @@
"size=0x%06lX (%8ld) offset=0x%04lX\n",
i, name,
tables[i].format,
- tables[i].size, tables[i].size,
+ tables[i].size, tables[i].size,
tables[i].offset ));
}
}
@@ -148,7 +149,7 @@
}
- static
+ static
const FT_Frame_Field pcf_metric_header[] =
{#undef FT_STRUCTURE
@@ -165,7 +166,7 @@
};
- static
+ static
const FT_Frame_Field pcf_metric_msb_header[] =
{#undef FT_STRUCTURE
@@ -182,7 +183,7 @@
};
- static
+ static
const FT_Frame_Field pcf_compressed_metric_header[] =
{#undef FT_STRUCTURE
@@ -198,29 +199,29 @@
};
- 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;
-
+
if ( READ_Fields( header, metric ) )
return error;
-
+
return PCF_Err_Ok;
}
- 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;
-
+
if ( READ_Fields( pcf_compressed_metric_header, &compr_metric ) )
return error;
@@ -235,15 +236,15 @@
metric->descent =
(FT_Short)( compr_metric.descent - 0x80 );
metric->attributes = 0;
-
+
return PCF_Err_Ok;
}
- 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;
@@ -260,15 +261,15 @@
return error;
}
-
- 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,14 +291,14 @@
}
- 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;
-
+
for ( i = 0; i < ntables; i++ )
if ( tables[i].type == type )
return TRUE;
@@ -306,7 +307,7 @@
}
- static
+ static
const FT_Frame_Field pcf_property_header[] =
{#undef FT_STRUCTURE
@@ -320,7 +321,7 @@
};
- static
+ static
const FT_Frame_Field pcf_property_msb_header[] =
{#undef FT_STRUCTURE
@@ -334,9 +335,9 @@
};
- 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;
@@ -348,7 +349,7 @@
if ( !strcmp( properties[i].name, prop ) )
found = 1;
}
-
+
if ( found )
return properties + i - 1;
else
@@ -356,9 +357,9 @@
}
- 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;
@@ -368,10 +369,10 @@
FT_Memory memory = FT_FACE(face)->memory;
FT_ULong string_size;
FT_String* strings = 0;
-
+
error = pcfSeekToType( stream,
- face->toc.tables,
+ face->toc.tables,
face->toc.count,
PCF_PROPERTIES,
&format,
@@ -395,7 +396,7 @@
goto Bail;
FT_TRACE4(( "get_prop: nprop = %d\n", nprops ));
-
+
if ( ALLOC( props, nprops * sizeof ( PCF_ParsePropertyRec ) ) )
goto Bail;
@@ -430,12 +431,12 @@
(void)READ_ULongLE( string_size );
if ( error )
goto Bail;
-
+
FT_TRACE4(( "get_prop: string_size = %ld\n", string_size ));
if ( ALLOC( strings, string_size * sizeof ( char ) ) )
goto Bail;
-
+
error = FT_Read_Stream( stream, (FT_Byte*)strings, string_size );
if ( error )
goto Bail;
@@ -442,38 +443,38 @@
if ( ALLOC( properties, nprops * sizeof ( PCF_PropertyRec ) ) )
goto Bail;
-
+
for ( i = 0; i < nprops; i++ )
{- /* XXX: make atom */
- if ( ALLOC( properties[i].name,
+ /* XXX: make atom */
+ if ( ALLOC( properties[i].name,
( strlen( strings + props[i].name ) + 1 ) *
sizeof ( char ) ) )
goto Bail;
strcpy( properties[i].name,strings + props[i].name );
-
+
properties[i].isString = props[i].isString;
-
+
if ( props[i].isString )
{- if ( ALLOC( properties[i].value.atom,
- ( strlen( strings + props[i].value ) + 1 ) *
+ if ( ALLOC( properties[i].value.atom,
+ ( strlen( strings + props[i].value ) + 1 ) *
sizeof ( char ) ) )
goto Bail;
strcpy( properties[i].value.atom, strings + props[i].value );
- }
+ }
else
properties[i].value.integer = props[i].value;
}
-
+
face->properties = properties;
face->nprops = nprops;
-
+
FREE( props );
FREE( strings );
-
+
return PCF_Err_Ok;
-
+
Bail:
FREE( props );
FREE( strings );
@@ -482,10 +483,10 @@
}
- 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;
FT_ULong format = 0;
@@ -496,12 +497,12 @@
error = pcfSeekToType( stream,
- face->toc.tables,
+ face->toc.tables,
face->toc.count,
PCF_METRICS,
&format,
&size );
- if ( error )
+ if ( error )
return error;
error = READ_ULongLE( format );
@@ -526,7 +527,7 @@
}
if ( error || nmetrics == -1 )
return PCF_Err_Invalid_File_Format;
-
+
face->nmetrics = nmetrics;
if ( ALLOC( face->metrics, nmetrics * sizeof ( PCF_MetricRec ) ) )
@@ -536,7 +537,7 @@
for ( i = 0; i < nmetrics; i++ )
{pcf_get_metric( stream, format, metrics + i );
-
+
metrics[i].bits = 0;
FT_TRACE4(( "%d : width=%d, "
@@ -548,7 +549,7 @@
( metrics + i )->ascent,
( metrics + i )->descent,
( metrics + i )->attributes ));
-
+
if ( error )
break;
}
@@ -559,9 +560,9 @@
}
- 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;
@@ -573,7 +574,7 @@
error = pcfSeekToType( stream,
- face->toc.tables,
+ face->toc.tables,
face->toc.count,
PCF_BITMAPS,
&format,
@@ -587,7 +588,7 @@
format = GET_ULongLE();
if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) )
return PCF_Err_Invalid_File_Format;
-
+
if ( PCF_BYTE_ORDER( format ) == MSBFirst )
nbitmaps = GET_ULong();
else
@@ -602,7 +603,7 @@
if ( error )
goto Bail;
for ( i = 0; i < nbitmaps; i++ )
- { + {if ( PCF_BYTE_ORDER( format ) == MSBFirst )
(void)READ_Long( offsets[i] );
else
@@ -616,9 +617,9 @@
if ( error )
goto Bail;
for ( i = 0; i < GLYPHPADOPTIONS; i++ )
- { + {if ( PCF_BYTE_ORDER( format ) == MSBFirst )
- (void)READ_Long( bitmapSizes[i] );
+ (void)READ_Long( bitmapSizes[i] );
else
(void)READ_LongLE( bitmapSizes[i] );
if ( error )
@@ -635,10 +636,10 @@
FT_TRACE4(( "bitmap size = %d\n", sizebitmaps ));
for ( i = 0; i < nbitmaps; i++ )
- face->metrics[i].bits = stream->pos + offsets[i];
-
+ face->metrics[i].bits = stream->pos + offsets[i];
+
face->bitmapsFormat = format;
-
+
FREE ( offsets );
return error;
@@ -649,9 +650,9 @@
}
- 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;
@@ -664,7 +665,7 @@
error = pcfSeekToType( stream,
- face->toc.tables,
+ face->toc.tables,
face->toc.count,
PCF_BDF_ENCODINGS,
&format,
@@ -678,7 +679,7 @@
format = GET_ULongLE();
if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) )
return PCF_Err_Invalid_File_Format;
-
+
if ( PCF_BYTE_ORDER( format ) == MSBFirst )
{firstCol = GET_Short();
@@ -705,18 +706,18 @@
if ( ALLOC( tmpEncoding, nencoding * sizeof ( PCF_EncodingRec ) ) )
return PCF_Err_Out_Of_Memory;
-
+
error = FT_Access_Frame( stream, 2 * nencoding );
if ( error )
goto Bail;
-
+
for ( i = 0, j = 0 ; i < nencoding; i++ )
{if ( PCF_BYTE_ORDER( format ) == MSBFirst )
- encodingOffset = GET_Short();
+ encodingOffset = GET_Short();
else
encodingOffset = GET_ShortLE();
-
+
if ( encodingOffset != (signed short)0xFFFF )
{tmpEncoding[j].enc = ( ( ( i / ( lastCol - firstCol + 1 ) ) +
@@ -755,7 +756,7 @@
}
- static
+ static
const FT_Frame_Field pcf_accel_header[] =
{#undef FT_STRUCTURE
@@ -777,7 +778,7 @@
};
- static
+ static
const FT_Frame_Field pcf_accel_msb_header[] =
{#undef FT_STRUCTURE
@@ -799,10 +800,10 @@
};
- 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;
@@ -811,11 +812,11 @@
error = pcfSeekToType( stream,
face->toc.tables,
- face->toc.count,
+ face->toc.count,
type,
&format,
&size );
- if ( error )
+ if ( error )
goto Bail;
error = READ_ULongLE( format );
@@ -822,7 +823,7 @@
if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) &&
!PCF_FORMAT_MATCH( format, PCF_ACCEL_W_INKBOUNDS ) )
goto Bail;
-
+
if ( PCF_BYTE_ORDER( format ) == MSBFirst )
{if ( READ_Fields( pcf_accel_msb_header, accel ) )
@@ -835,12 +836,12 @@
}
error = pcf_get_metric( stream, format, &(accel->minbounds) );
- if ( error )
+ if ( error )
goto Bail;
error = pcf_get_metric( stream, format, &(accel->maxbounds) );
if ( error )
goto Bail;
-
+
if ( PCF_FORMAT_MATCH( format, PCF_ACCEL_W_INKBOUNDS ) )
{error = pcf_get_metric( stream, format, &(accel->ink_minbounds) );
@@ -849,7 +850,7 @@
error = pcf_get_metric( stream, format, &(accel->ink_maxbounds) );
if ( error )
goto Bail;
- }
+ }
else
{accel->ink_minbounds = accel->minbounds; /* I'm not sure about this */
@@ -856,15 +857,15 @@
accel->ink_maxbounds = accel->maxbounds;
}
return error;
-
+
Bail:
return error;
}
- 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;
@@ -878,18 +879,18 @@
error = pcf_get_properties( stream, face );
if ( error )
return error;;
-
+
/* Use the old accelerators if no BDF accelerators are in the file. */
hasBDFAccelerators = pcfHasType( face->toc.tables,
- face->toc.count,
+ face->toc.count,
PCF_BDF_ACCELERATORS );
if ( !hasBDFAccelerators )
{error = pcf_get_accel( stream, face, PCF_ACCELERATORS );
- if ( error )
+ if ( error )
goto Bail;
}
-
+
/* metrics */
error = pcf_get_metrics( stream, face );
if ( error )
@@ -904,13 +905,13 @@
error = pcf_get_encodings( stream, face );
if ( error )
goto Bail;
-
+
/* BDF style accelerators (i.e. bounds based on encoded glyphs) */
if ( hasBDFAccelerators )
{error = pcf_get_accel( stream, face, PCF_BDF_ACCELERATORS );
if ( error )
- goto Bail;
+ goto Bail;
}
/* XXX: TO DO: inkmetrics and glyph_names are missing */
@@ -926,13 +927,13 @@
root->face_flags = FT_FACE_FLAG_FIXED_SIZES |
FT_FACE_FLAG_HORIZONTAL |
FT_FACE_FLAG_FAST_GLYPHS;
-
+
if ( face->accel.constantWidth )
root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;
root->style_flags = 0;
prop = find_property( face, "SLANT" );
- if ( prop != NULL )
+ if ( prop != NULL )
if ( prop->isString )
if ( ( *(prop->value.atom) == 'O' ) ||
( *(prop->value.atom) == 'I' ) )
@@ -939,7 +940,7 @@
root->style_flags |= FT_STYLE_FLAG_ITALIC;
prop = find_property( face, "WEIGHT_NAME" );
- if ( prop != NULL )
+ if ( prop != NULL )
if ( prop->isString )
if ( *(prop->value.atom) == 'B' )
root->style_flags |= FT_STYLE_FLAG_BOLD;
@@ -954,7 +955,7 @@
}
else if ( root->style_flags & FT_STYLE_FLAG_ITALIC )
root->style_name = (char *)"Italic";
-
+
prop = find_property( face, "FAMILY_NAME" );
if ( prop != NULL )
{@@ -972,11 +973,11 @@
root->family_name = 0;
root->num_glyphs = face->nmetrics;
-
+
root->num_fixed_sizes = 1;
if ( ALLOC_ARRAY( root->available_sizes, 1, FT_Bitmap_Size ) )
goto Bail;
-
+
prop = find_property( face, "PIXEL_SIZE" );
if ( prop != NULL )
{@@ -998,9 +999,9 @@
#if 0
printf( "PCF Warning: Pixel Size undefined, assuming 12\n");
#endif
- root->available_sizes->width = 12;
+ root->available_sizes->width = 12;
root->available_sizes->height = 12;
- }
+ }
/* XXX: charmaps */
root->charmaps = &face->charmap_handle;
@@ -1008,8 +1009,8 @@
{PCF_Property charset_registry = 0, charset_encoding = 0;
-
+
charset_registry = find_property( face, "CHARSET_REGISTRY" );
charset_encoding = find_property( face, "CHARSET_ENCODING" );
@@ -1019,18 +1020,18 @@
if ( ( charset_registry->isString ) &&
( charset_encoding->isString ) )
{- if ( ALLOC( face->charset_encoding,
+ if ( ALLOC( face->charset_encoding,
( strlen( charset_encoding->value.atom ) + 1 ) *
- sizeof ( char ) ) )
+ sizeof ( char ) ) )
goto Bail;
- if ( ALLOC( face->charset_registry,
+ if ( ALLOC( face->charset_registry,
( strlen( charset_registry->value.atom ) + 1 ) *
- sizeof ( char ) ) )
+ sizeof ( char ) ) )
goto Bail;
strcpy( face->charset_registry, charset_registry->value.atom );
strcpy( face->charset_encoding, charset_encoding->value.atom );
-#if 0
+#if 0
if ( !strcmp( charset_registry, "ISO10646" ) )
{face->charmap.encoding = ft_encoding_unicode;
@@ -1045,14 +1046,14 @@
}
}
}
-
+
face->charmap.encoding = ft_encoding_none;
face->charmap.platform_id = 0;
face->charmap.encoding_id = 0;
- face->charmap.face = root;
+ face->charmap.face = root;
face->charmap_handle = &face->charmap;
root->charmap = face->charmap_handle;
- }
+ }
return PCF_Err_Ok;
Bail:
--- a/src/pcf/pcfutil.c
+++ b/src/pcf/pcfutil.c
@@ -72,8 +72,9 @@
* 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 @@
* 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 @@
* 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 @@
* 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;
@@ -142,7 +146,7 @@
switch ( srcPad )
{- case 1:
+ case 1:
srcWidthBytes = ( width + 7 ) >> 3;
break;
@@ -150,12 +154,12 @@
srcWidthBytes = ( ( width + 15 ) >> 4 ) << 1;
break;
- case 4:
+ case 4:
srcWidthBytes = ( ( width + 31 ) >> 5 ) << 2;
break;
- case 8:
- srcWidthBytes = ( ( width + 63 ) >> 6 ) << 3;
+ case 8:
+ srcWidthBytes = ( ( width + 63 ) >> 6 ) << 3;
break;
default:
@@ -164,7 +168,7 @@
switch ( dstPad )
{- case 1:
+ case 1:
dstWidthBytes = ( width + 7 ) >> 3;
break;
@@ -172,12 +176,12 @@
dstWidthBytes = ( ( width + 15 ) >> 4 ) << 1;
break;
- case 4:
+ case 4:
dstWidthBytes = ( ( width + 31 ) >> 5 ) << 2;
break;
- case 8:
- dstWidthBytes = ( ( width + 63 ) >> 6 ) << 3;
+ case 8:
+ dstWidthBytes = ( ( width + 63 ) >> 6 ) << 3;
break;
default:
--- a/src/pcf/pcfutil.h
+++ b/src/pcf/pcfutil.h
@@ -1,9 +1,9 @@
-/* pcfutil.h
+/* pcfutil.h
FreeType font driver for pcf fonts
- Copyright 2000 by
- Francesco Zappa Nardelli
+ Copyright 2000 by
+ Francesco Zappa Nardelli
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -32,21 +32,25 @@
#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__ */
--- a/src/psaux/psobjs.c
+++ b/src/psaux/psobjs.c
@@ -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,25 +957,25 @@
}
- 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 );
@@ -982,11 +982,11 @@
}
- 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,9 +1126,9 @@
/* 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 );
}
@@ -1135,11 +1135,11 @@
/* 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 )
{--- a/src/psaux/psobjs.h
+++ b/src/psaux/psobjs.h
@@ -46,23 +46,23 @@
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,67 +74,67 @@
/*************************************************************************/
- 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_Table( 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_Long T1_ToInt( T1_Parser* parser );
+ 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_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_ToFixedArray( T1_Parser* parser,
- FT_Int max_values,
- FT_Fixed* values,
- 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_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_Done_Parser( T1_Parser* parser );
+ 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 );
+
/*************************************************************************/
/*************************************************************************/
/***** *****/
@@ -143,42 +143,42 @@
/*************************************************************************/
/*************************************************************************/
- 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_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
--- a/src/psaux/t1decode.c
+++ b/src/psaux/t1decode.c
@@ -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;
@@ -925,7 +925,7 @@
{/* We are using subroutines from a CID font. We must adjust */
/* for the seed bytes. */
- zone->base += ( decoder->lenIV >= 0 ? decoder->lenIV : 0 );
+ zone->base += ( decoder->lenIV >= 0 ? decoder->lenIV : 0 );
zone->limit = decoder->subrs[index + 1];
}
@@ -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 );
}
--- a/src/psaux/t1decode.h
+++ b/src/psaux/t1decode.h
@@ -33,26 +33,26 @@
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