ref: 52005c304229e2bfc54c0d406944d125d4849920
parent: 93616ecb6601b133f9f33082c05d2675a556a001
author: Werner Lemberg <[email protected]>
date: Wed Jun 27 19:25:46 EDT 2001
formatting
--- a/src/psnames/psmodule.c
+++ b/src/psnames/psmodule.c
@@ -39,8 +39,8 @@
/* we do deal with glyph variants by detecting a non-initial dot in */
/* the name, as in `A.swash' or `e.final', etc. */
/* */
- static
- FT_ULong PS_Unicode_Value( const char* glyph_name )
+ static FT_ULong
+ PS_Unicode_Value( const char* glyph_name )
{FT_Int n;
char first = glyph_name[0];
@@ -129,7 +129,7 @@
/* qsort callback to sort the unicode map */
- FT_CALLBACK_DEF(int)
+ FT_CALLBACK_DEF( int )
compare_uni_maps( const void* a,
const void* b )
{@@ -142,11 +142,11 @@
/* Builds a table that maps Unicode values to glyph indices */
- static
- FT_Error PS_Build_Unicode_Table( FT_Memory memory,
- FT_UInt num_glyphs,
- const char** glyph_names,
- PS_Unicodes* table )
+ static FT_Error
+ PS_Build_Unicode_Table( FT_Memory memory,
+ FT_UInt num_glyphs,
+ const char** glyph_names,
+ PS_Unicodes* table )
{FT_Error error;
@@ -208,9 +208,9 @@
}
- static
- FT_UInt PS_Lookup_Unicode( PS_Unicodes* table,
- FT_ULong unicode )
+ static FT_UInt
+ PS_Lookup_Unicode( PS_Unicodes* table,
+ FT_ULong unicode )
{PS_UniMap *min, *max, *mid;
@@ -242,8 +242,8 @@
#endif /* FT_CONFIG_OPTION_ADOBE_GLYPH_LIST */
- static
- const char* PS_Macintosh_Name( FT_UInt name_index )
+ static const char*
+ PS_Macintosh_Name( FT_UInt name_index )
{if ( name_index >= 258 )
name_index = 0;
@@ -252,8 +252,8 @@
}
- static
- const char* PS_Standard_Strings( FT_UInt sid )
+ static const char*
+ PS_Standard_Strings( FT_UInt sid )
{return ( sid < NUM_STD_GLYPHS ? t1_standard_glyphs[sid] : 0 );
}
--- a/src/raster/ftraster.c
+++ b/src/raster/ftraster.c
@@ -342,16 +342,19 @@
/* prototypes used for sweep function dispatch */
- typedef void Function_Sweep_Init( RAS_ARGS Short* min,
- Short* max );
+ typedef void
+ Function_Sweep_Init( RAS_ARGS Short* min,
+ Short* max );
- typedef void Function_Sweep_Span( RAS_ARGS Short y,
- FT_F26Dot6 x1,
- FT_F26Dot6 x2,
- PProfile left,
- PProfile right );
+ typedef void
+ Function_Sweep_Span( RAS_ARGS Short y,
+ FT_F26Dot6 x1,
+ FT_F26Dot6 x2,
+ PProfile left,
+ PProfile right );
- typedef void Function_Sweep_Step( RAS_ARG );
+ typedef void
+ Function_Sweep_Step( RAS_ARG );
/* NOTE: These operations are only valid on 2's complement processors */
@@ -513,8 +516,8 @@
/* High :: Set to True for high precision (typically for ppem < 18), */
/* false otherwise. */
/* */
- static
- void Set_High_Precision( RAS_ARGS Int High )
+ static void
+ Set_High_Precision( RAS_ARGS Int High )
{if ( High )
{@@ -553,8 +556,8 @@
/* SUCCESS on success. FAILURE in case of overflow or of incoherent */
/* profile. */
/* */
- static
- Bool New_Profile( RAS_ARGS TStates aState )
+ static Bool
+ New_Profile( RAS_ARGS TStates aState )
{if ( !ras.fProfile )
{@@ -615,8 +618,8 @@
/* <Return> */
/* SUCCESS on success. FAILURE in case of overflow or incoherency. */
/* */
- static
- Bool End_Profile( RAS_ARG )
+ static Bool
+ End_Profile( RAS_ARG )
{Long h;
PProfile oldProfile;
@@ -676,8 +679,8 @@
/* <Return> */
/* SUCCESS on success. FAILURE in case of overflow. */
/* */
- static
- Bool Insert_Y_Turn( RAS_ARGS Int y )
+ static Bool
+ Insert_Y_Turn( RAS_ARGS Int y )
{PLong y_turns;
Int y2, n;
@@ -727,8 +730,8 @@
/* <Return> */
/* SUCCESS on success. FAILURE in case of overflow. */
/* */
- static
- Bool Finalize_Profile_Table( RAS_ARG )
+ static Bool
+ Finalize_Profile_Table( RAS_ARG )
{Int bottom, top;
UShort n;
@@ -793,8 +796,8 @@
/* This routine is the `beef' of this component. It is _the_ inner */
/* loop that should be optimized to hell to get the best performance. */
/* */
- static
- void Split_Conic( TPoint* base )
+ static void
+ Split_Conic( TPoint* base )
{Long a, b;
@@ -830,8 +833,8 @@
/* inner loops that should be optimized like hell to get the best */
/* performance. */
/* */
- static
- void Split_Cubic( TPoint* base )
+ static void
+ Split_Cubic( TPoint* base )
{Long a, b, c, d;
@@ -883,13 +886,13 @@
/* <Return> */
/* SUCCESS on success, FAILURE on render pool overflow. */
/* */
- static
- Bool Line_Up( RAS_ARGS Long x1,
- Long y1,
- Long x2,
- Long y2,
- Long miny,
- Long maxy )
+ static Bool
+ Line_Up( RAS_ARGS Long x1,
+ Long y1,
+ Long x2,
+ Long y2,
+ Long miny,
+ Long maxy )
{Long Dx, Dy;
Int e1, e2, f1, f2, size; /* XXX: is `Short' sufficient? */
@@ -1022,13 +1025,13 @@
/* <Return> */
/* SUCCESS on success, FAILURE on render pool overflow. */
/* */
- static
- Bool Line_Down( RAS_ARGS Long x1,
- Long y1,
- Long x2,
- Long y2,
- Long miny,
- Long maxy )
+ static Bool
+ Line_Down( RAS_ARGS Long x1,
+ Long y1,
+ Long x2,
+ Long y2,
+ Long miny,
+ Long maxy )
{Bool result, fresh;
@@ -1069,11 +1072,11 @@
/* <Return> */
/* SUCCESS on success, FAILURE on render pool overflow. */
/* */
- static
- Bool Bezier_Up( RAS_ARGS Int degree,
- TSplitter splitter,
- Long miny,
- Long maxy )
+ static Bool
+ Bezier_Up( RAS_ARGS Int degree,
+ TSplitter splitter,
+ Long miny,
+ Long maxy )
{Long y1, y2, e, e2, e0;
Short f1;
@@ -1202,11 +1205,11 @@
/* <Return> */
/* SUCCESS on success, FAILURE on render pool overflow. */
/* */
- static
- Bool Bezier_Down( RAS_ARGS Int degree,
- TSplitter splitter,
- Long miny,
- Long maxy )
+ static Bool
+ Bezier_Down( RAS_ARGS Int degree,
+ TSplitter splitter,
+ Long miny,
+ Long maxy )
{TPoint* arc = ras.arc;
Bool result, fresh;
@@ -1249,9 +1252,9 @@
/* SUCCESS on success, FAILURE on render pool overflow or incorrect */
/* profile. */
/* */
- static
- Bool Line_To( RAS_ARGS Long x,
- Long y )
+ static Bool
+ Line_To( RAS_ARGS Long x,
+ Long y )
{/* First, detect a change of direction */
@@ -1343,11 +1346,11 @@
/* SUCCESS on success, FAILURE on render pool overflow or incorrect */
/* profile. */
/* */
- static
- Bool Conic_To( RAS_ARGS Long cx,
- Long cy,
- Long x,
- Long y )
+ static Bool
+ Conic_To( RAS_ARGS Long cx,
+ Long cy,
+ Long x,
+ Long y )
{Long y1, y2, y3, x3, ymin, ymax;
TStates state_bez;
@@ -1457,13 +1460,13 @@
/* SUCCESS on success, FAILURE on render pool overflow or incorrect */
/* profile. */
/* */
- static
- Bool Cubic_To( RAS_ARGS Long cx1,
- Long cy1,
- Long cx2,
- Long cy2,
- Long x,
- Long y )
+ static Bool
+ Cubic_To( RAS_ARGS Long cx1,
+ Long cy1,
+ Long cx2,
+ Long cy2,
+ Long x,
+ Long y )
{Long y1, y2, y3, y4, x4, ymin1, ymax1, ymin2, ymax2;
TStates state_bez;
@@ -1589,10 +1592,10 @@
/* <Return> */
/* SUCCESS on success, FAILURE on error. */
/* */
- static
- Bool Decompose_Curve( RAS_ARGS UShort first,
- UShort last,
- int flipped )
+ static Bool
+ Decompose_Curve( RAS_ARGS UShort first,
+ UShort last,
+ int flipped )
{FT_Vector v_last;
FT_Vector v_control;
@@ -1805,8 +1808,8 @@
/* SUCCESS on success, FAILURE if any error was encountered during */
/* rendering. */
/* */
- static
- Bool Convert_Glyph( RAS_ARGS int flipped )
+ static Bool
+ Convert_Glyph( RAS_ARGS int flipped )
{int i;
unsigned start;
@@ -1880,8 +1883,8 @@
/* */
/* Initializes an empty linked list. */
/* */
- static
- void Init_Linked( TProfileList* l )
+ static void
+ Init_Linked( TProfileList* l )
{*l = NULL;
}
@@ -1893,9 +1896,9 @@
/* */
/* Inserts a new profile in a linked list. */
/* */
- static
- void InsNew( PProfileList list,
- PProfile profile )
+ static void
+ InsNew( PProfileList list,
+ PProfile profile )
{PProfile *old, current;
Long x;
@@ -1924,9 +1927,9 @@
/* */
/* Removes an old profile from a linked list. */
/* */
- static
- void DelOld( PProfileList list,
- PProfile profile )
+ static void
+ DelOld( PProfileList list,
+ PProfile profile )
{PProfile *old, current;
@@ -1957,8 +1960,8 @@
/* */
/* Update all X offsets of a drawing list. */
/* */
- static
- void Update( PProfile first )
+ static void
+ Update( PProfile first )
{PProfile current = first;
@@ -1981,8 +1984,8 @@
/* an algorithm which is fast in this case. Bubble sort is enough */
/* and simple. */
/* */
- static
- void Sort( PProfileList list )
+ static void
+ Sort( PProfileList list )
{PProfile *old, current, next;
@@ -2033,9 +2036,9 @@
/* */
/*************************************************************************/
- static
- void Vertical_Sweep_Init( RAS_ARGS Short* min,
- Short* max )
+ static void
+ Vertical_Sweep_Init( RAS_ARGS Short* min,
+ Short* max )
{Long pitch = ras.target.pitch;
@@ -2052,12 +2055,12 @@
}
- static
- void Vertical_Sweep_Span( RAS_ARGS Short y,
- FT_F26Dot6 x1,
- FT_F26Dot6 x2,
- PProfile left,
- PProfile right )
+ static void
+ Vertical_Sweep_Span( RAS_ARGS Short y,
+ FT_F26Dot6 x1,
+ FT_F26Dot6 x2,
+ PProfile left,
+ PProfile right )
{Long e1, e2;
int c1, c2;
@@ -2118,12 +2121,12 @@
}
- static
- void Vertical_Sweep_Drop( RAS_ARGS Short y,
- FT_F26Dot6 x1,
- FT_F26Dot6 x2,
- PProfile left,
- PProfile right )
+ static void
+ Vertical_Sweep_Drop( RAS_ARGS Short y,
+ FT_F26Dot6 x1,
+ FT_F26Dot6 x2,
+ PProfile left,
+ PProfile right )
{Long e1, e2;
Short c1, f1;
@@ -2229,8 +2232,8 @@
}
- static
- void Vertical_Sweep_Step( RAS_ARG )
+ static void
+ Vertical_Sweep_Step( RAS_ARG )
{ras.traceOfs += ras.traceIncr;
}
@@ -2245,9 +2248,9 @@
/* */
/***********************************************************************/
- static
- void Horizontal_Sweep_Init( RAS_ARGS Short* min,
- Short* max )
+ static void
+ Horizontal_Sweep_Init( RAS_ARGS Short* min,
+ Short* max )
{/* nothing, really */
FT_UNUSED( raster );
@@ -2256,12 +2259,12 @@
}
- static
- void Horizontal_Sweep_Span( RAS_ARGS Short y,
- FT_F26Dot6 x1,
- FT_F26Dot6 x2,
- PProfile left,
- PProfile right )
+ static void
+ Horizontal_Sweep_Span( RAS_ARGS Short y,
+ FT_F26Dot6 x1,
+ FT_F26Dot6 x2,
+ PProfile left,
+ PProfile right )
{Long e1, e2;
PByte bits;
@@ -2299,12 +2302,12 @@
}
- static
- void Horizontal_Sweep_Drop( RAS_ARGS Short y,
- FT_F26Dot6 x1,
- FT_F26Dot6 x2,
- PProfile left,
- PProfile right )
+ static void
+ Horizontal_Sweep_Drop( RAS_ARGS Short y,
+ FT_F26Dot6 x1,
+ FT_F26Dot6 x2,
+ PProfile left,
+ PProfile right )
{Long e1, e2;
PByte bits;
@@ -2395,8 +2398,8 @@
}
- static
- void Horizontal_Sweep_Step( RAS_ARG )
+ static void
+ Horizontal_Sweep_Step( RAS_ARG )
{/* Nothing, really */
FT_UNUSED( raster );
@@ -2422,9 +2425,9 @@
/* */
/*************************************************************************/
- static
- void Vertical_Gray_Sweep_Init( RAS_ARGS Short* min,
- Short* max )
+ static void
+ Vertical_Gray_Sweep_Init( RAS_ARGS Short* min,
+ Short* max )
{Long pitch, byte_len;
@@ -2449,8 +2452,8 @@
}
- static
- void Vertical_Gray_Sweep_Step( RAS_ARG )
+ static void
+ Vertical_Gray_Sweep_Step( RAS_ARG )
{Int c1, c2;
PByte pix, bit, bit2;
@@ -2538,12 +2541,12 @@
}
- static
- void Horizontal_Gray_Sweep_Span( RAS_ARGS Short y,
- FT_F26Dot6 x1,
- FT_F26Dot6 x2,
- PProfile left,
- PProfile right )
+ static void
+ Horizontal_Gray_Sweep_Span( RAS_ARGS Short y,
+ FT_F26Dot6 x1,
+ FT_F26Dot6 x2,
+ PProfile left,
+ PProfile right )
{/* nothing, really */
FT_UNUSED( raster );
@@ -2555,12 +2558,12 @@
}
- static
- void Horizontal_Gray_Sweep_Drop( RAS_ARGS Short y,
- FT_F26Dot6 x1,
- FT_F26Dot6 x2,
- PProfile left,
- PProfile right )
+ static void
+ Horizontal_Gray_Sweep_Drop( RAS_ARGS Short y,
+ FT_F26Dot6 x1,
+ FT_F26Dot6 x2,
+ PProfile left,
+ PProfile right )
{Long e1, e2;
PByte pixel;
@@ -2648,8 +2651,8 @@
/* */
/*************************************************************************/
- static
- Bool Draw_Sweep( RAS_ARG )
+ static Bool
+ Draw_Sweep( RAS_ARG )
{Short y, y_change, y_height;
@@ -2900,8 +2903,8 @@
/* <Return> */
/* Renderer error code. */
/* */
- static
- int Render_Single_Pass( RAS_ARGS Bool flipped )
+ static int
+ Render_Single_Pass( RAS_ARGS Bool flipped )
{Short i, j, k;
@@ -2972,8 +2975,8 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- FT_LOCAL_DEF
- FT_Error Render_Glyph( RAS_ARG )
+ FT_LOCAL_DEF FT_Error
+ Render_Glyph( RAS_ARG )
{FT_Error error;
@@ -3035,8 +3038,8 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- FT_LOCAL_DEF
- FT_Error Render_Gray_Glyph( RAS_ARG )
+ FT_LOCAL_DEF FT_Error
+ Render_Gray_Glyph( RAS_ARG )
{Long pixel_width;
FT_Error error;
@@ -3106,8 +3109,8 @@
#endif /* FT_RASTER_OPTION_ANTI_ALIASING */
- static
- void ft_black_init( TRaster_Instance* raster )
+ static void
+ ft_black_init( TRaster_Instance* raster )
{FT_UInt n;
FT_ULong c;
@@ -3145,9 +3148,9 @@
#ifdef _STANDALONE_
- static
- int ft_black_new( void* memory,
- FT_Raster *araster )
+ static int
+ ft_black_new( void* memory,
+ FT_Raster *araster )
{static FT_RasterRec_ the_raster;
@@ -3160,8 +3163,8 @@
}
- static
- void ft_black_done( FT_Raster raster )
+ static void
+ ft_black_done( FT_Raster raster )
{/* nothing */
raster->init = 0;
@@ -3171,9 +3174,9 @@
#else /* _STANDALONE_ */
- static
- int ft_black_new( FT_Memory memory,
- TRaster_Instance** araster )
+ static int
+ ft_black_new( FT_Memory memory,
+ TRaster_Instance** araster )
{FT_Error error;
TRaster_Instance* raster;
@@ -3192,8 +3195,8 @@
}
- static
- void ft_black_done( TRaster_Instance* raster )
+ static void
+ ft_black_done( TRaster_Instance* raster )
{FT_Memory memory = (FT_Memory)raster->memory;
FREE( raster );
@@ -3203,10 +3206,10 @@
#endif /* _STANDALONE_ */
- static
- void ft_black_reset( TRaster_Instance* raster,
- const char* pool_base,
- long pool_size )
+ static void
+ ft_black_reset( TRaster_Instance* raster,
+ const char* pool_base,
+ long pool_size )
{if ( raster && pool_base && pool_size >= 4096 )
{@@ -3217,10 +3220,10 @@
}
- static
- void ft_black_set_mode( TRaster_Instance* raster,
- unsigned long mode,
- const char* palette )
+ static void
+ ft_black_set_mode( TRaster_Instance* raster,
+ unsigned long mode,
+ const char* palette )
{#ifdef FT_RASTER_OPTION_ANTI_ALIASING
@@ -3244,9 +3247,9 @@
}
- static
- int ft_black_render( TRaster_Instance* raster,
- FT_Raster_Params* params )
+ static int
+ ft_black_render( TRaster_Instance* raster,
+ FT_Raster_Params* params )
{FT_Outline* outline = (FT_Outline*)params->source;
FT_Bitmap* target_map = params->target;
--- a/src/raster/ftrend1.c
+++ b/src/raster/ftrend1.c
@@ -26,8 +26,8 @@
/* initialize renderer -- init its raster */
- static
- FT_Error ft_raster1_init( FT_Renderer render )
+ static FT_Error
+ ft_raster1_init( FT_Renderer render )
{FT_Library library = FT_MODULE_LIBRARY( render );
@@ -41,10 +41,10 @@
/* set render-specific mode */
- static
- FT_Error ft_raster1_set_mode( FT_Renderer render,
- FT_ULong mode_tag,
- FT_Pointer data )
+ static FT_Error
+ ft_raster1_set_mode( FT_Renderer render,
+ FT_ULong mode_tag,
+ FT_Pointer data )
{/* we simply pass it to the raster */
return render->clazz->raster_class->raster_set_mode( render->raster,
@@ -54,11 +54,11 @@
/* transform a given glyph image */
- static
- FT_Error ft_raster1_transform( FT_Renderer render,
- FT_GlyphSlot slot,
- FT_Matrix* matrix,
- FT_Vector* delta )
+ static FT_Error
+ ft_raster1_transform( FT_Renderer render,
+ FT_GlyphSlot slot,
+ FT_Matrix* matrix,
+ FT_Vector* delta )
{FT_Error error = Raster_Err_Ok;
@@ -81,10 +81,10 @@
/* return the glyph's control box */
- static
- void ft_raster1_get_cbox( FT_Renderer render,
- FT_GlyphSlot slot,
- FT_BBox* cbox )
+ static void
+ ft_raster1_get_cbox( FT_Renderer render,
+ FT_GlyphSlot slot,
+ FT_BBox* cbox )
{MEM_Set( cbox, 0, sizeof ( *cbox ) );
@@ -94,11 +94,11 @@
/* convert a slot's glyph image into a bitmap */
- static
- FT_Error ft_raster1_render( FT_Renderer render,
- FT_GlyphSlot slot,
- FT_UInt mode,
- FT_Vector* origin )
+ static FT_Error
+ ft_raster1_render( FT_Renderer render,
+ FT_GlyphSlot slot,
+ FT_UInt mode,
+ FT_Vector* origin )
{FT_Error error;
FT_Outline* outline;
--- a/src/sfnt/sfdriver.c
+++ b/src/sfnt/sfdriver.c
@@ -36,9 +36,9 @@
#include <string.h> /* for strcmp() */
- static
- void* get_sfnt_table( TT_Face face,
- FT_Sfnt_Tag tag )
+ static void*
+ get_sfnt_table( TT_Face face,
+ FT_Sfnt_Tag tag )
{void* table;
@@ -84,11 +84,11 @@
#ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
- static
- FT_Error get_sfnt_glyph_name( TT_Face face,
- FT_UInt glyph_index,
- FT_Pointer buffer,
- FT_UInt buffer_max )
+ static FT_Error
+ get_sfnt_glyph_name( TT_Face face,
+ FT_UInt glyph_index,
+ FT_Pointer buffer,
+ FT_UInt buffer_max )
{FT_String* gname;
FT_Error error;
@@ -114,7 +114,7 @@
#endif /* TT_CONFIG_OPTION_POSTSCRIPT_NAMES */
- FT_CALLBACK_DEF(FT_Module_Interface)
+ FT_CALLBACK_DEF( FT_Module_Interface )
SFNT_Get_Interface( FT_Module module,
const char* interface )
{--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -53,9 +53,9 @@
/* <Return> */
/* Character string. NULL if no name is present. */
/* */
- static
- FT_String* Get_Name( TT_Face face,
- FT_UShort nameid )
+ static FT_String*
+ Get_Name( TT_Face face,
+ FT_UShort nameid )
{FT_Memory memory = face->root.memory;
FT_UShort n;
@@ -128,9 +128,9 @@
}
- 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
{@@ -178,12 +178,12 @@
}
- FT_LOCAL_DEF
- FT_Error SFNT_Init_Face( FT_Stream stream,
- TT_Face face,
- FT_Int face_index,
- FT_Int num_params,
- FT_Parameter* params )
+ FT_LOCAL_DEF FT_Error
+ SFNT_Init_Face( FT_Stream stream,
+ TT_Face face,
+ FT_Int face_index,
+ FT_Int num_params,
+ FT_Parameter* params )
{FT_Error error;
FT_Library library = face->root.driver->root.library;
@@ -241,12 +241,12 @@
!= SFNT_Err_Ok )
- FT_LOCAL_DEF
- FT_Error SFNT_Load_Face( FT_Stream stream,
- TT_Face face,
- FT_Int face_index,
- FT_Int num_params,
- FT_Parameter* params )
+ FT_LOCAL_DEF FT_Error
+ SFNT_Load_Face( FT_Stream stream,
+ TT_Face face,
+ FT_Int face_index,
+ FT_Int num_params,
+ FT_Parameter* params )
{FT_Error error;
FT_Bool has_outline;
@@ -587,8 +587,8 @@
#undef LOAD_
- FT_LOCAL_DEF
- void SFNT_Done_Face( TT_Face face )
+ FT_LOCAL_DEF void
+ SFNT_Done_Face( TT_Face face )
{FT_Memory memory = face->root.memory;
SFNT_Interface* sfnt = (SFNT_Interface*)face->sfnt;
--- a/src/sfnt/sfobjs.h
+++ b/src/sfnt/sfobjs.h
@@ -28,22 +28,22 @@
FT_BEGIN_HEADER
- FT_LOCAL
- FT_Error SFNT_Init_Face( FT_Stream stream,
- TT_Face face,
- FT_Int face_index,
- FT_Int num_params,
- FT_Parameter* params );
+ FT_LOCAL FT_Error
+ SFNT_Init_Face( FT_Stream stream,
+ TT_Face face,
+ FT_Int face_index,
+ FT_Int num_params,
+ FT_Parameter* params );
- FT_LOCAL
- FT_Error SFNT_Load_Face( FT_Stream stream,
- TT_Face face,
- FT_Int face_index,
- FT_Int num_params,
- FT_Parameter* params );
+ FT_LOCAL FT_Error
+ SFNT_Load_Face( FT_Stream stream,
+ TT_Face face,
+ FT_Int face_index,
+ FT_Int num_params,
+ FT_Parameter* params );
- FT_LOCAL
- void SFNT_Done_Face( TT_Face face );
+ FT_LOCAL void
+ SFNT_Done_Face( TT_Face face );
FT_END_HEADER
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -34,18 +34,23 @@
#define FT_COMPONENT trace_ttcmap
- FT_CALLBACK_DEF(FT_UInt) code_to_index0( TT_CMapTable* charmap,
- FT_ULong char_code );
+ FT_CALLBACK_DEF( FT_UInt )
+ code_to_index0( TT_CMapTable* charmap,
+ FT_ULong char_code );
- FT_CALLBACK_DEF(FT_UInt) code_to_index2( TT_CMapTable* charmap,
- FT_ULong char_code );
+ FT_CALLBACK_DEF( FT_UInt )
+ code_to_index2( TT_CMapTable* charmap,
+ FT_ULong char_code );
- FT_CALLBACK_DEF(FT_UInt) code_to_index4( TT_CMapTable* charmap,
- FT_ULong char_code );
+ FT_CALLBACK_DEF( FT_UInt )
+ code_to_index4( TT_CMapTable* charmap,
+ FT_ULong char_code );
- FT_CALLBACK_DEF(FT_UInt) code_to_index6( TT_CMapTable* charmap,
- FT_ULong char_code );
+ FT_CALLBACK_DEF( FT_UInt )
+ code_to_index6( TT_CMapTable* charmap,
+ FT_ULong char_code );
+
/*************************************************************************/
/* */
/* <Function> */
@@ -69,10 +74,10 @@
/* opened). In case of error, all partially allocated tables are */
/* released. */
/* */
- FT_LOCAL_DEF
- FT_Error TT_CharMap_Load( TT_Face face,
- TT_CMapTable* cmap,
- FT_Stream stream )
+ FT_LOCAL_DEF FT_Error
+ TT_CharMap_Load( TT_Face face,
+ TT_CMapTable* cmap,
+ FT_Stream stream )
{FT_Error error;
FT_Memory memory;
@@ -287,9 +292,9 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- FT_LOCAL_DEF
- FT_Error TT_CharMap_Free( TT_Face face,
- TT_CMapTable* cmap )
+ FT_LOCAL_DEF FT_Error
+ TT_CharMap_Free( TT_Face face,
+ TT_CMapTable* cmap )
{FT_Memory memory;
@@ -349,7 +354,7 @@
/* <Return> */
/* Glyph index into the glyphs array. 0 if the glyph does not exist. */
/* */
- FT_CALLBACK_DEF(FT_UInt)
+ FT_CALLBACK_DEF( FT_UInt )
code_to_index0( TT_CMapTable* cmap,
FT_ULong charCode )
{@@ -375,7 +380,7 @@
/* <Return> */
/* Glyph index into the glyphs array. 0 if the glyph does not exist. */
/* */
- FT_CALLBACK_DEF(FT_UInt)
+ FT_CALLBACK_DEF( FT_UInt )
code_to_index2( TT_CMapTable* cmap,
FT_ULong charCode )
{@@ -439,7 +444,7 @@
/* <Return> */
/* Glyph index into the glyphs array. 0 if the glyph does not exist. */
/* */
- FT_CALLBACK_DEF(FT_UInt)
+ FT_CALLBACK_DEF( FT_UInt )
code_to_index4( TT_CMapTable* cmap,
FT_ULong charCode )
{@@ -522,7 +527,7 @@
/* <Return> */
/* Glyph index into the glyphs array. 0 if the glyph does not exist. */
/* */
- FT_CALLBACK_DEF(FT_UInt)
+ FT_CALLBACK_DEF( FT_UInt )
code_to_index6( TT_CMapTable* cmap,
FT_ULong charCode )
{--- a/src/sfnt/ttcmap.h
+++ b/src/sfnt/ttcmap.h
@@ -27,14 +27,14 @@
FT_BEGIN_HEADER
- FT_LOCAL
- FT_Error TT_CharMap_Load( TT_Face face,
- TT_CMapTable* cmap,
- FT_Stream input );
+ FT_LOCAL FT_Error
+ TT_CharMap_Load( TT_Face face,
+ TT_CMapTable* cmap,
+ FT_Stream input );
- FT_LOCAL
- FT_Error TT_CharMap_Free( TT_Face face,
- TT_CMapTable* cmap );
+ FT_LOCAL FT_Error
+ TT_CharMap_Free( TT_Face face,
+ TT_CMapTable* cmap );
FT_END_HEADER
--- a/src/sfnt/ttload.c
+++ b/src/sfnt/ttload.c
@@ -53,9 +53,9 @@
/* <Return> */
/* A pointer to the table directory entry. 0 if not found. */
/* */
- FT_LOCAL_DEF
- TT_Table* TT_LookUp_Table( TT_Face face,
- FT_ULong tag )
+ FT_LOCAL_DEF TT_Table*
+ TT_LookUp_Table( TT_Face face,
+ FT_ULong tag )
{TT_Table* entry;
TT_Table* limit;
@@ -104,11 +104,11 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- FT_LOCAL_DEF
- FT_Error TT_Goto_Table( TT_Face face,
- FT_ULong tag,
- FT_Stream stream,
- FT_ULong* length )
+ FT_LOCAL_DEF FT_Error
+ TT_Goto_Table( TT_Face face,
+ FT_ULong tag,
+ FT_Stream stream,
+ FT_ULong* length )
{TT_Table* table;
FT_Error error;
@@ -159,11 +159,11 @@
/* The header will be checked whether it is valid by looking at the */
/* values of `search_range', `entry_selector', and `range_shift'. */
/* */
- FT_LOCAL_DEF
- FT_Error TT_Load_SFNT_Header( TT_Face face,
- FT_Stream stream,
- FT_Long face_index,
- SFNT_Header* sfnt )
+ FT_LOCAL_DEF FT_Error
+ TT_Load_SFNT_Header( TT_Face face,
+ FT_Stream stream,
+ FT_Long face_index,
+ SFNT_Header* sfnt )
{FT_Error error;
FT_ULong format_tag;
@@ -294,10 +294,10 @@
/* <Note> */
/* The stream cursor must be at the font file's origin. */
/* */
- FT_LOCAL_DEF
- FT_Error TT_Load_Directory( TT_Face face,
- FT_Stream stream,
- SFNT_Header* sfnt )
+ FT_LOCAL_DEF FT_Error
+ TT_Load_Directory( TT_Face face,
+ FT_Stream stream,
+ SFNT_Header* sfnt )
{FT_Error error;
FT_Memory memory = stream->memory;
@@ -388,12 +388,12 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- FT_LOCAL_DEF
- FT_Error TT_Load_Any( TT_Face face,
- FT_ULong tag,
- FT_Long offset,
- FT_Byte* buffer,
- FT_ULong* length )
+ FT_LOCAL_DEF FT_Error
+ TT_Load_Any( TT_Face face,
+ FT_ULong tag,
+ FT_Long offset,
+ FT_Byte* buffer,
+ FT_ULong* length )
{FT_Error error;
FT_Stream stream;
@@ -453,10 +453,10 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- static
- FT_Error TT_Load_Generic_Header( TT_Face face,
- FT_Stream stream,
- FT_ULong tag )
+ static FT_Error
+ TT_Load_Generic_Header( TT_Face face,
+ FT_Stream stream,
+ FT_ULong tag )
{FT_Error error;
TT_Header* header;
@@ -519,9 +519,9 @@
}
- FT_LOCAL_DEF
- FT_Error TT_Load_Header( TT_Face face,
- FT_Stream stream )
+ FT_LOCAL_DEF FT_Error
+ TT_Load_Header( TT_Face face,
+ FT_Stream stream )
{return TT_Load_Generic_Header( face, stream, TTAG_head );
}
@@ -529,9 +529,9 @@
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
- FT_LOCAL_DEF
- FT_Error TT_Load_Bitmap_Header( TT_Face face,
- FT_Stream stream )
+ FT_LOCAL_DEF FT_Error
+ TT_Load_Bitmap_Header( TT_Face face,
+ FT_Stream stream )
{return TT_Load_Generic_Header( face, stream, TTAG_bhed );
}
@@ -554,9 +554,9 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- FT_LOCAL_DEF
- FT_Error TT_Load_MaxProfile( TT_Face face,
- FT_Stream stream )
+ FT_LOCAL_DEF FT_Error
+ TT_Load_MaxProfile( TT_Face face,
+ FT_Stream stream )
{FT_Error error;
TT_MaxProfile* maxProfile = &face->max_profile;
@@ -649,10 +649,10 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- static
- FT_Error TT_Load_Metrics( TT_Face face,
- FT_Stream stream,
- FT_Bool vertical )
+ static FT_Error
+ TT_Load_Metrics( TT_Face face,
+ FT_Stream stream,
+ FT_Bool vertical )
{FT_Error error;
FT_Memory memory = stream->memory;
@@ -789,10 +789,10 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- FT_LOCAL_DEF
- FT_Error TT_Load_Metrics_Header( TT_Face face,
- FT_Stream stream,
- FT_Bool vertical )
+ FT_LOCAL_DEF FT_Error
+ TT_Load_Metrics_Header( TT_Face face,
+ FT_Stream stream,
+ FT_Bool vertical )
{FT_Error error;
TT_HoriHeader* header;
@@ -888,9 +888,9 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- FT_LOCAL_DEF
- FT_Error TT_Load_Names( TT_Face face,
- FT_Stream stream )
+ FT_LOCAL_DEF FT_Error
+ TT_Load_Names( TT_Face face,
+ FT_Stream stream )
{FT_Error error;
FT_Memory memory = stream->memory;
@@ -1054,8 +1054,8 @@
/* <Input> */
/* face :: A handle to the target face object. */
/* */
- FT_LOCAL_DEF
- void TT_Free_Names( TT_Face face )
+ FT_LOCAL_DEF void
+ TT_Free_Names( TT_Face face )
{FT_Memory memory = face->root.driver->root.memory;
TT_NameTable* names = &face->name_table;
@@ -1089,9 +1089,9 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- FT_LOCAL_DEF
- FT_Error TT_Load_CMap( TT_Face face,
- FT_Stream stream )
+ FT_LOCAL_DEF FT_Error
+ TT_Load_CMap( TT_Face face,
+ FT_Stream stream )
{FT_Error error;
FT_Memory memory = stream->memory;
@@ -1204,9 +1204,9 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- FT_LOCAL_DEF
- FT_Error TT_Load_OS2( TT_Face face,
- FT_Stream stream )
+ FT_LOCAL_DEF FT_Error
+ TT_Load_OS2( TT_Face face,
+ FT_Stream stream )
{FT_Error error;
TT_OS2* os2;
@@ -1341,9 +1341,9 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- FT_LOCAL_DEF
- FT_Error TT_Load_PostScript( TT_Face face,
- FT_Stream stream )
+ FT_LOCAL_DEF FT_Error
+ TT_Load_PostScript( TT_Face face,
+ FT_Stream stream )
{FT_Error error;
TT_Postscript* post = &face->postscript;
@@ -1399,9 +1399,9 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- FT_LOCAL_DEF
- FT_Error TT_Load_PCLT( TT_Face face,
- FT_Stream stream )
+ FT_LOCAL_DEF FT_Error
+ TT_Load_PCLT( TT_Face face,
+ FT_Stream stream )
{static const FT_Frame_Field pclt_fields[] =
{@@ -1466,9 +1466,9 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- FT_LOCAL_DEF
- FT_Error TT_Load_Gasp( TT_Face face,
- FT_Stream stream )
+ FT_LOCAL_DEF FT_Error
+ TT_Load_Gasp( TT_Face face,
+ FT_Stream stream )
{FT_Error error;
FT_Memory memory = stream->memory;
@@ -1520,6 +1520,11 @@
}
+ FT_CALLBACK_DEF( int )
+ tt_kern_pair_compare( const void* a,
+ const void* b );
+
+
/*************************************************************************/
/* */
/* <Function> */
@@ -1538,13 +1543,9 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
-
- FT_CALLBACK_DEF(int)
- tt_kern_pair_compare( const void* a, const void* b );
-
- FT_LOCAL_DEF
- FT_Error TT_Load_Kern( TT_Face face,
- FT_Stream stream )
+ FT_LOCAL_DEF FT_Error
+ TT_Load_Kern( TT_Face face,
+ FT_Stream stream )
{FT_Error error;
FT_Memory memory = stream->memory;
@@ -1656,7 +1657,7 @@
#undef TT_KERN_INDEX
#define TT_KERN_INDEX( g1, g2 ) ( ( (FT_ULong)g1 << 16 ) | g2 )
- FT_CALLBACK_DEF(int)
+ FT_CALLBACK_DEF( int )
tt_kern_pair_compare( const void* a,
const void* b )
{@@ -1689,9 +1690,9 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- FT_LOCAL_DEF
- FT_Error TT_Load_Hdmx( TT_Face face,
- FT_Stream stream )
+ FT_LOCAL_DEF FT_Error
+ TT_Load_Hdmx( TT_Face face,
+ FT_Stream stream )
{FT_Error error;
FT_Memory memory = stream->memory;
@@ -1767,8 +1768,8 @@
/* <Input> */
/* face :: A handle to the target face object. */
/* */
- FT_LOCAL_DEF
- void TT_Free_Hdmx( TT_Face face )
+ FT_LOCAL_DEF void
+ TT_Free_Hdmx( TT_Face face )
{if ( face )
{--- a/src/sfnt/ttload.h
+++ b/src/sfnt/ttload.h
@@ -29,101 +29,102 @@
FT_BEGIN_HEADER
- FT_LOCAL
- TT_Table* TT_LookUp_Table( TT_Face face,
- FT_ULong tag );
+ FT_LOCAL TT_Table*
+ TT_LookUp_Table( TT_Face face,
+ FT_ULong tag );
- FT_LOCAL
- FT_Error TT_Goto_Table( TT_Face face,
- FT_ULong tag,
- FT_Stream stream,
- FT_ULong* length );
+ FT_LOCAL FT_Error
+ TT_Goto_Table( TT_Face face,
+ FT_ULong tag,
+ FT_Stream stream,
+ FT_ULong* length );
- FT_LOCAL
- FT_Error TT_Load_SFNT_Header( TT_Face face,
- FT_Stream stream,
- FT_Long face_index,
- SFNT_Header* sfnt );
- FT_LOCAL
- FT_Error TT_Load_Directory( TT_Face face,
- FT_Stream stream,
- SFNT_Header* sfnt );
+ FT_LOCAL FT_Error
+ TT_Load_SFNT_Header( TT_Face face,
+ FT_Stream stream,
+ FT_Long face_index,
+ SFNT_Header* sfnt );
- FT_LOCAL
- FT_Error TT_Load_Any( TT_Face face,
- FT_ULong tag,
- FT_Long offset,
- FT_Byte* buffer,
- FT_ULong* length );
+ FT_LOCAL FT_Error
+ TT_Load_Directory( TT_Face face,
+ FT_Stream stream,
+ SFNT_Header* sfnt );
+ FT_LOCAL FT_Error
+ TT_Load_Any( TT_Face face,
+ FT_ULong tag,
+ FT_Long offset,
+ FT_Byte* buffer,
+ FT_ULong* length );
- FT_LOCAL
- FT_Error TT_Load_Header( TT_Face face,
- FT_Stream stream );
+ FT_LOCAL FT_Error
+ TT_Load_Header( TT_Face face,
+ FT_Stream stream );
- FT_LOCAL
- FT_Error TT_Load_Metrics_Header( TT_Face face,
- FT_Stream stream,
- FT_Bool vertical );
+ FT_LOCAL FT_Error
+ TT_Load_Metrics_Header( TT_Face face,
+ FT_Stream stream,
+ FT_Bool vertical );
- FT_LOCAL
- FT_Error TT_Load_CMap( TT_Face face,
- FT_Stream stream );
-
- FT_LOCAL
- FT_Error TT_Load_MaxProfile( TT_Face face,
- FT_Stream stream );
+ FT_LOCAL FT_Error
+ TT_Load_CMap( TT_Face face,
+ FT_Stream stream );
- FT_LOCAL
- FT_Error TT_Load_Names( TT_Face face,
- FT_Stream stream );
+ FT_LOCAL FT_Error
+ TT_Load_MaxProfile( TT_Face face,
+ FT_Stream stream );
- FT_LOCAL
- FT_Error TT_Load_OS2( TT_Face face,
- FT_Stream stream );
+ FT_LOCAL FT_Error
+ TT_Load_Names( TT_Face face,
+ FT_Stream stream );
- FT_LOCAL
- FT_Error TT_Load_PostScript( TT_Face face,
- FT_Stream stream );
+ FT_LOCAL FT_Error
+ TT_Load_OS2( TT_Face face,
+ FT_Stream stream );
- FT_LOCAL
- FT_Error TT_Load_Hdmx( TT_Face face,
- FT_Stream stream );
+ FT_LOCAL FT_Error
+ TT_Load_PostScript( TT_Face face,
+ FT_Stream stream );
- FT_LOCAL
- FT_Error TT_Load_PCLT( TT_Face face,
- FT_Stream stream );
- FT_LOCAL
- void TT_Free_Names( TT_Face face );
+ FT_LOCAL FT_Error
+ TT_Load_Hdmx( TT_Face face,
+ FT_Stream stream );
+ FT_LOCAL FT_Error
+ TT_Load_PCLT( TT_Face face,
+ FT_Stream stream );
- FT_LOCAL
- void TT_Free_Hdmx ( TT_Face face );
+ FT_LOCAL void
+ TT_Free_Names( TT_Face face );
- FT_LOCAL
- FT_Error TT_Load_Kern( TT_Face face,
- FT_Stream stream );
+ FT_LOCAL void
+ TT_Free_Hdmx ( TT_Face face );
- FT_LOCAL
- FT_Error TT_Load_Gasp( TT_Face face,
- FT_Stream stream );
+ FT_LOCAL FT_Error
+ TT_Load_Kern( TT_Face face,
+ FT_Stream stream );
+
+ FT_LOCAL FT_Error
+ TT_Load_Gasp( TT_Face face,
+ FT_Stream stream );
+
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
- FT_LOCAL
- FT_Error TT_Load_Bitmap_Header( TT_Face face,
- FT_Stream stream );
+ FT_LOCAL FT_Error
+ TT_Load_Bitmap_Header( TT_Face face,
+ FT_Stream stream );
#endif /* TT_CONFIG_OPTION_EMBEDDED_BITMAPS */
--- a/src/sfnt/ttpost.c
+++ b/src/sfnt/ttpost.c
@@ -151,9 +151,9 @@
#endif /* FT_CONFIG_OPTION_POSTSCRIPT_NAMES */
- static
- FT_Error Load_Format_20( TT_Face face,
- FT_Stream stream )
+ static FT_Error
+ Load_Format_20( TT_Face face,
+ FT_Stream stream )
{FT_Memory memory = stream->memory;
FT_Error error;
@@ -270,9 +270,9 @@
}
- static
- FT_Error Load_Format_25( TT_Face face,
- FT_Stream stream )
+ static FT_Error
+ Load_Format_25( TT_Face face,
+ FT_Stream stream )
{FT_Memory memory = stream->memory;
FT_Error error;
@@ -333,8 +333,8 @@
}
- static
- FT_Error Load_Post_Names( TT_Face face )
+ static FT_Error
+ Load_Post_Names( TT_Face face )
{FT_Stream stream;
FT_Error error;
@@ -377,8 +377,8 @@
}
- FT_LOCAL_DEF
- void TT_Free_Post_Names( TT_Face face )
+ FT_LOCAL_DEF void
+ TT_Free_Post_Names( TT_Face face )
{FT_Memory memory = face->root.memory;
TT_Post_Names* names = &face->postscript_names;
@@ -441,10 +441,10 @@
/* <Output> */
/* FreeType error code. 0 means success. */
/* */
- FT_LOCAL_DEF
- FT_Error TT_Get_PS_Name( TT_Face face,
- FT_UInt index,
- FT_String** PSname )
+ FT_LOCAL_DEF FT_Error
+ TT_Get_PS_Name( TT_Face face,
+ FT_UInt index,
+ FT_String** PSname )
{FT_Error error;
TT_Post_Names* names;
--- a/src/sfnt/ttpost.h
+++ b/src/sfnt/ttpost.h
@@ -29,13 +29,13 @@
FT_BEGIN_HEADER
- FT_LOCAL
- FT_Error TT_Get_PS_Name( TT_Face face,
- FT_UInt index,
- FT_String** PSname );
+ FT_LOCAL FT_Error
+ TT_Get_PS_Name( TT_Face face,
+ FT_UInt index,
+ FT_String** PSname );
- FT_LOCAL
- void TT_Free_Post_Names( TT_Face face );
+ FT_LOCAL void
+ TT_Free_Post_Names( TT_Face face );
FT_END_HEADER
--- a/src/sfnt/ttsbit.c
+++ b/src/sfnt/ttsbit.c
@@ -63,13 +63,13 @@
/* convention). A positive y offset indicates a downwards */
/* direction! */
/* */
- static
- void blit_sbit( FT_Bitmap* target,
- FT_Byte* source,
- FT_Int line_bits,
- FT_Bool byte_padded,
- FT_Int x_offset,
- FT_Int y_offset )
+ static void
+ blit_sbit( FT_Bitmap* target,
+ FT_Byte* source,
+ FT_Int line_bits,
+ FT_Bool byte_padded,
+ FT_Int x_offset,
+ FT_Int y_offset )
{FT_Byte* line_buff;
FT_Int line_incr;
@@ -221,9 +221,9 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- static
- FT_Error Load_SBit_Const_Metrics( TT_SBit_Range* range,
- FT_Stream stream )
+ static FT_Error
+ Load_SBit_Const_Metrics( TT_SBit_Range* range,
+ FT_Stream stream )
{FT_Error error;
@@ -253,10 +253,10 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- static
- FT_Error Load_SBit_Range_Codes( TT_SBit_Range* range,
- FT_Stream stream,
- FT_Bool load_offsets )
+ static FT_Error
+ Load_SBit_Range_Codes( TT_SBit_Range* range,
+ FT_Stream stream,
+ FT_Bool load_offsets )
{FT_Error error;
FT_ULong count, n, size;
@@ -316,9 +316,9 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- static
- FT_Error Load_SBit_Range( TT_SBit_Range* range,
- FT_Stream stream )
+ static FT_Error
+ Load_SBit_Range( TT_SBit_Range* range,
+ FT_Stream stream )
{FT_Error error;
FT_Memory memory = stream->memory;
@@ -391,9 +391,9 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
- FT_LOCAL_DEF
- FT_Error TT_Load_SBit_Strikes( TT_Face face,
- FT_Stream stream )
+ FT_LOCAL_DEF FT_Error
+ TT_Load_SBit_Strikes( TT_Face face,
+ FT_Stream stream )
{FT_Error error = 0;
FT_Memory memory = stream->memory;
@@ -588,8 +588,8 @@
/* <Input> */
/* face :: The target face object. */
/* */
- FT_LOCAL_DEF
- void TT_Free_SBit_Strikes( TT_Face face )
+ FT_LOCAL_DEF void
+ TT_Free_SBit_Strikes( TT_Face face )
{FT_Memory memory = face->root.memory;
TT_SBit_Strike* strike = face->sbit_strikes;
@@ -623,11 +623,11 @@
}
- FT_LOCAL_DEF
- FT_Error TT_Set_SBit_Strike( TT_Face face,
- FT_Int x_ppem,
- FT_Int y_ppem,
- FT_ULong *astrike_index )
+ FT_LOCAL_DEF FT_Error
+ TT_Set_SBit_Strike( TT_Face face,
+ FT_Int x_ppem,
+ FT_Int y_ppem,
+ FT_ULong *astrike_index )
{FT_Int i;
@@ -673,11 +673,11 @@
/* <Return> */
/* FreeType error code. 0 means the glyph index was found. */
/* */
- static
- FT_Error Find_SBit_Range( FT_UInt glyph_index,
- TT_SBit_Strike* strike,
- TT_SBit_Range** arange,
- FT_ULong* aglyph_offset )
+ static FT_Error
+ Find_SBit_Range( FT_UInt glyph_index,
+ TT_SBit_Strike* strike,
+ TT_SBit_Range** arange,
+ FT_ULong* aglyph_offset )
{TT_SBit_Range *range, *range_limit;
@@ -779,15 +779,16 @@
/* */
/* <Return> */
/* FreeType error code. 0 means success. Returns */
- /* SFNT_Err_Invalid_Argument if no sbit exists for the requested glyph. */
+ /* SFNT_Err_Invalid_Argument if no sbit exists for the requested */
+ /* glyph. */
/* */
- static
- FT_Error Find_SBit_Image( TT_Face face,
- FT_UInt glyph_index,
- FT_ULong strike_index,
- TT_SBit_Range* *arange,
- TT_SBit_Strike* *astrike,
- FT_ULong *aglyph_offset )
+ static FT_Error
+ Find_SBit_Image( TT_Face face,
+ FT_UInt glyph_index,
+ FT_ULong strike_index,
+ TT_SBit_Range* *arange,
+ TT_SBit_Strike* *astrike,
+ FT_ULong *aglyph_offset )
{FT_Error error;
TT_SBit_Strike* strike;
@@ -845,10 +846,10 @@
/* positioned just after the metrics header in the `EBDT' table on */
/* function exit. */
/* */
- static
- FT_Error Load_SBit_Metrics( FT_Stream stream,
- TT_SBit_Range* range,
- TT_SBit_Metrics* metrics )
+ static FT_Error
+ Load_SBit_Metrics( FT_Stream stream,
+ TT_SBit_Range* range,
+ TT_SBit_Metrics* metrics )
{FT_Error error = SFNT_Err_Ok;
@@ -931,9 +932,9 @@
/* */
/* metrics :: The corresponding metrics structure. */
/* */
- static
- void Crop_Bitmap( FT_Bitmap* map,
- TT_SBit_Metrics* metrics )
+ static void
+ Crop_Bitmap( FT_Bitmap* map,
+ TT_SBit_Metrics* metrics )
{/***********************************************************************/
/* */
@@ -1122,14 +1123,14 @@
}
- static
- FT_Error Load_SBit_Single( FT_Bitmap* map,
- FT_Int x_offset,
- FT_Int y_offset,
- FT_Int pix_bits,
- FT_UShort image_format,
- TT_SBit_Metrics* metrics,
- FT_Stream stream )
+ static FT_Error
+ Load_SBit_Single( FT_Bitmap* map,
+ FT_Int x_offset,
+ FT_Int y_offset,
+ FT_Int pix_bits,
+ FT_UShort image_format,
+ TT_SBit_Metrics* metrics,
+ FT_Stream stream )
{FT_Error error;
@@ -1202,16 +1203,16 @@
}
- static
- FT_Error Load_SBit_Image( TT_SBit_Strike* strike,
- TT_SBit_Range* range,
- FT_ULong ebdt_pos,
- FT_ULong glyph_offset,
- FT_Bitmap* map,
- FT_Int x_offset,
- FT_Int y_offset,
- FT_Stream stream,
- TT_SBit_Metrics* metrics )
+ static FT_Error
+ Load_SBit_Image( TT_SBit_Strike* strike,
+ TT_SBit_Range* range,
+ FT_ULong ebdt_pos,
+ FT_ULong glyph_offset,
+ FT_Bitmap* map,
+ FT_Int x_offset,
+ FT_Int y_offset,
+ FT_Stream stream,
+ TT_SBit_Metrics* metrics )
{FT_Memory memory = stream->memory;
FT_Error error;
@@ -1394,14 +1395,14 @@
/* <Note> */
/* The `map.buffer' field is always freed before the glyph is loaded. */
/* */
- FT_LOCAL_DEF
- FT_Error TT_Load_SBit_Image( TT_Face face,
- FT_ULong strike_index,
- FT_UInt glyph_index,
- FT_UInt load_flags,
- FT_Stream stream,
- FT_Bitmap *map,
- TT_SBit_Metrics *metrics )
+ FT_LOCAL_DEF FT_Error
+ TT_Load_SBit_Image( TT_Face face,
+ FT_ULong strike_index,
+ FT_UInt glyph_index,
+ FT_UInt load_flags,
+ FT_Stream stream,
+ FT_Bitmap *map,
+ TT_SBit_Metrics *metrics )
{FT_Error error;
FT_Memory memory = stream->memory;
--- a/src/sfnt/ttsbit.h
+++ b/src/sfnt/ttsbit.h
@@ -27,28 +27,28 @@
FT_BEGIN_HEADER
- FT_LOCAL
- FT_Error TT_Load_SBit_Strikes( TT_Face face,
- FT_Stream stream );
+ FT_LOCAL FT_Error
+ TT_Load_SBit_Strikes( TT_Face face,
+ FT_Stream stream );
- FT_LOCAL
- void TT_Free_SBit_Strikes( TT_Face face );
+ FT_LOCAL void
+ TT_Free_SBit_Strikes( TT_Face face );
- FT_LOCAL
- FT_Error TT_Set_SBit_Strike( TT_Face face,
- FT_Int x_ppem,
- FT_Int y_ppem,
- FT_ULong *astrike_index );
+ FT_LOCAL FT_Error
+ TT_Set_SBit_Strike( TT_Face face,
+ FT_Int x_ppem,
+ FT_Int y_ppem,
+ FT_ULong *astrike_index );
- FT_LOCAL
- FT_Error TT_Load_SBit_Image( TT_Face face,
- FT_ULong strike_index,
- FT_UInt glyph_index,
- FT_UInt load_flags,
- FT_Stream stream,
- FT_Bitmap *map,
- TT_SBit_Metrics *metrics );
+ FT_LOCAL FT_Error
+ TT_Load_SBit_Image( TT_Face face,
+ FT_ULong strike_index,
+ FT_UInt glyph_index,
+ FT_UInt load_flags,
+ FT_Stream stream,
+ FT_Bitmap *map,
+ TT_SBit_Metrics *metrics );
FT_END_HEADER
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -278,9 +278,9 @@
/* */
/* Initialize the cells table. */
/* */
- static
- void init_cells( RAS_ARG_ void* buffer,
- long byte_size )
+ static void
+ init_cells( RAS_ARG_ void* buffer,
+ long byte_size )
{ras.cells = (PCell)buffer;
ras.max_cells = byte_size / sizeof ( TCell );
@@ -295,8 +295,8 @@
/* */
/* Compute the outline bounding box. */
/* */
- static
- void compute_cbox( RAS_ARG_ FT_Outline* outline )
+ static void
+ compute_cbox( RAS_ARG_ FT_Outline* outline )
{FT_Vector* vec = outline->points;
FT_Vector* limit = vec + outline->n_points;
@@ -338,8 +338,8 @@
/* */
/* Record the current cell in the table. */
/* */
- static
- int record_cell( RAS_ARG )
+ static int
+ record_cell( RAS_ARG )
{PCell cell;
@@ -364,9 +364,9 @@
/* */
/* Set the current cell to a new position. */
/* */
- static
- int set_cell( RAS_ARG_ TScan ex,
- TScan ey )
+ static int
+ set_cell( RAS_ARG_ TScan ex,
+ TScan ey )
{int invalid, record, clean;
@@ -422,9 +422,9 @@
/* */
/* Start a new contour at a given cell. */
/* */
- static
- void start_cell( RAS_ARG_ TScan ex,
- TScan ey )
+ static void
+ start_cell( RAS_ARG_ TScan ex,
+ TScan ey )
{if ( ex < ras.min_ex )
ex = ras.min_ex - 1;
@@ -444,12 +444,12 @@
/* */
/* Render a scanline as one or more cells. */
/* */
- static
- int render_scanline( RAS_ARG_ TScan ey,
- TPos x1,
- TScan y1,
- TPos x2,
- TScan y2 )
+ static int
+ render_scanline( RAS_ARG_ TScan ey,
+ TPos x1,
+ TScan y1,
+ TPos x2,
+ TScan y2 )
{TScan ex1, ex2, fx1, fx2, delta;
long p, first, dx;
@@ -555,9 +555,9 @@
/* */
/* Render a given line as a series of scanlines. */
/* */
- static
- int render_line( RAS_ARG_ TPos to_x,
- TPos to_y )
+ static int
+ render_line( RAS_ARG_ TPos to_x,
+ TPos to_y )
{TScan ey1, ey2, fy1, fy2;
TPos dx, dy, x, x2;
@@ -677,8 +677,8 @@
}
- static
- void split_conic( FT_Vector* base )
+ static void
+ split_conic( FT_Vector* base )
{TPos a, b;
@@ -697,9 +697,9 @@
}
- static
- int render_conic( RAS_ARG_ FT_Vector* control,
- FT_Vector* to )
+ static int
+ render_conic( RAS_ARG_ FT_Vector* control,
+ FT_Vector* to )
{TPos dx, dy;
int top, level;
@@ -804,8 +804,8 @@
}
- static
- void split_cubic( FT_Vector* base )
+ static void
+ split_cubic( FT_Vector* base )
{TPos a, b, c, d;
@@ -832,10 +832,10 @@
}
- static
- int render_cubic( RAS_ARG_ FT_Vector* control1,
- FT_Vector* control2,
- FT_Vector* to )
+ static int
+ render_cubic( RAS_ARG_ FT_Vector* control1,
+ FT_Vector* control2,
+ FT_Vector* to )
{TPos dx, dy, da, db;
int top, level;
@@ -978,9 +978,9 @@
/* a simple shell sort algorithm that works directly on our */
/* cells table */
- static
- void shell_sort ( PCell cells,
- int count )
+ static void
+ shell_sort ( PCell cells,
+ int count )
{PCell i, j, limit = cells + count;
TCell temp;
@@ -1024,9 +1024,9 @@
#define QSORT_THRESHOLD 9 /* below this size, a sub-array will be sorted */
/* through a normal insertion sort */
- static
- void quick_sort( PCell cells,
- int count )
+ static void
+ quick_sort( PCell cells,
+ int count )
{PCell stack[40]; /* should be enough ;-) */
PCell* top; /* top of stack */
@@ -1124,9 +1124,9 @@
#ifdef DEBUG_GRAYS
#ifdef DEBUG_SORT
- static
- int check_sort( PCell cells,
- int count )
+ static int
+ check_sort( PCell cells,
+ int count )
{PCell p, q;
@@ -1144,9 +1144,9 @@
#endif /* DEBUG_GRAYS */
- static
- int Move_To( FT_Vector* to,
- FT_Raster raster )
+ static int
+ Move_To( FT_Vector* to,
+ FT_Raster raster )
{TPos x, y;
@@ -1164,9 +1164,9 @@
}
- static
- int Line_To( FT_Vector* to,
- FT_Raster raster )
+ static int
+ Line_To( FT_Vector* to,
+ FT_Raster raster )
{return render_line( (PRaster)raster,
UPSCALE( to->x ), UPSCALE( to->y ) );
@@ -1173,30 +1173,30 @@
}
- static
- int Conic_To( FT_Vector* control,
- FT_Vector* to,
- FT_Raster raster )
+ static int
+ Conic_To( FT_Vector* control,
+ FT_Vector* to,
+ FT_Raster raster )
{return render_conic( (PRaster)raster, control, to );
}
- static
- int Cubic_To( FT_Vector* control1,
- FT_Vector* control2,
- FT_Vector* to,
- FT_Raster raster )
+ static int
+ Cubic_To( FT_Vector* control1,
+ FT_Vector* control2,
+ FT_Vector* to,
+ FT_Raster raster )
{return render_cubic( (PRaster)raster, control1, control2, to );
}
- static
- void grays_render_span( int y,
- int count,
- FT_Span* spans,
- PRaster raster )
+ static void
+ grays_render_span( int y,
+ int count,
+ FT_Span* spans,
+ PRaster raster )
{unsigned char* p;
FT_Bitmap* map = &raster->target;
@@ -1228,8 +1228,8 @@
#include <stdio.h>
- static
- void dump_cells( RAS_ARG )
+ static void
+ dump_cells( RAS_ARG )
{PCell cell, limit;
int y = -1;
@@ -1254,11 +1254,11 @@
#endif /* DEBUG_GRAYS */
- static
- void grays_hline( RAS_ARG_ TScan x,
- TScan y,
- TPos area,
- int acount )
+ static void
+ grays_hline( RAS_ARG_ TScan x,
+ TScan y,
+ TPos area,
+ int acount )
{FT_Span* span;
int count;
@@ -1354,8 +1354,8 @@
}
- static
- void grays_sweep( RAS_ARG_ FT_Bitmap* target )
+ static void
+ grays_sweep( RAS_ARG_ FT_Bitmap* target )
{TScan x, y, cover, area;
PCell start, cur, limit;
@@ -1481,10 +1481,10 @@
/* <Return> */
/* Error code. 0 means sucess. */
/* */
- static
- int FT_Outline_Decompose( FT_Outline* outline,
- const FT_Outline_Funcs* interface,
- void* user )
+ static int
+ FT_Outline_Decompose( FT_Outline* outline,
+ const FT_Outline_Funcs* interface,
+ void* user )
{#undef SCALED
#define SCALED( x ) ( ( (x) << shift ) - delta )
@@ -1691,8 +1691,8 @@
} TBand;
- static
- int grays_convert_glyph( RAS_ARG_ FT_Outline* outline )
+ static int
+ grays_convert_glyph( RAS_ARG_ FT_Outline* outline )
{static
const FT_Outline_Funcs interface =
@@ -1830,9 +1830,9 @@
}
- extern
- int grays_raster_render( PRaster raster,
- FT_Raster_Params* params )
+ extern int
+ grays_raster_render( PRaster raster,
+ FT_Raster_Params* params )
{FT_Outline* outline = (FT_Outline*)params->source;
FT_Bitmap* target_map = params->target;
@@ -1907,9 +1907,9 @@
#ifdef _STANDALONE_
- static
- int grays_raster_new( void* memory,
- FT_Raster* araster )
+ static int
+ grays_raster_new( void* memory,
+ FT_Raster* araster )
{static TRaster the_raster;
@@ -1923,8 +1923,8 @@
}
- static
- void grays_raster_done( FT_Raster raster )
+ static void
+ grays_raster_done( FT_Raster raster )
{/* nothing */
FT_UNUSED( raster );
@@ -1932,9 +1932,9 @@
#else /* _STANDALONE_ */
- static
- int grays_raster_new( FT_Memory memory,
- FT_Raster* araster )
+ static int
+ grays_raster_new( FT_Memory memory,
+ FT_Raster* araster )
{FT_Error error;
PRaster raster;
@@ -1951,8 +1951,8 @@
}
- static
- void grays_raster_done( FT_Raster raster )
+ static void
+ grays_raster_done( FT_Raster raster )
{FT_Memory memory = (FT_Memory)((PRaster)raster)->memory;
@@ -1963,10 +1963,10 @@
#endif /* _STANDALONE_ */
- static
- void grays_raster_reset( FT_Raster raster,
- const char* pool_base,
- long pool_size )
+ static void
+ grays_raster_reset( FT_Raster raster,
+ const char* pool_base,
+ long pool_size )
{PRaster rast = (PRaster)raster;
--- a/src/smooth/ftsmooth.c
+++ b/src/smooth/ftsmooth.c
@@ -26,8 +26,8 @@
/* initialize renderer -- init its raster */
- static
- FT_Error ft_smooth_init( FT_Renderer render )
+ static FT_Error
+ ft_smooth_init( FT_Renderer render )
{FT_Library library = FT_MODULE_LIBRARY( render );
@@ -41,10 +41,10 @@
/* sets render-specific mode */
- static
- FT_Error ft_smooth_set_mode( FT_Renderer render,
- FT_ULong mode_tag,
- FT_Pointer data )
+ static FT_Error
+ ft_smooth_set_mode( FT_Renderer render,
+ FT_ULong mode_tag,
+ FT_Pointer data )
{/* we simply pass it to the raster */
return render->clazz->raster_class->raster_set_mode( render->raster,
@@ -53,11 +53,11 @@
}
/* transform a given glyph image */
- static
- FT_Error ft_smooth_transform( FT_Renderer render,
- FT_GlyphSlot slot,
- FT_Matrix* matrix,
- FT_Vector* delta )
+ static FT_Error
+ ft_smooth_transform( FT_Renderer render,
+ FT_GlyphSlot slot,
+ FT_Matrix* matrix,
+ FT_Vector* delta )
{FT_Error error = Smooth_Err_Ok;
@@ -80,10 +80,10 @@
/* return the glyph's control box */
- static
- void ft_smooth_get_cbox( FT_Renderer render,
- FT_GlyphSlot slot,
- FT_BBox* cbox )
+ static void
+ ft_smooth_get_cbox( FT_Renderer render,
+ FT_GlyphSlot slot,
+ FT_BBox* cbox )
{MEM_Set( cbox, 0, sizeof ( *cbox ) );
@@ -93,11 +93,11 @@
/* convert a slot's glyph image into a bitmap */
- static
- FT_Error ft_smooth_render( FT_Renderer render,
- FT_GlyphSlot slot,
- FT_UInt mode,
- FT_Vector* origin )
+ static FT_Error
+ ft_smooth_render( FT_Renderer render,
+ FT_GlyphSlot slot,
+ FT_UInt mode,
+ FT_Vector* origin )
{FT_Error error;
FT_Outline* outline;