From 4a2305cf0c686d58273e264780b48b159e42f604 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Thu, 28 Jun 2001 07:17:51 +0000 Subject: [PATCH] formatting --- builds/unix/ftsystem.c | 7 +- builds/vms/ftsystem.c | 5 +- include/freetype/freetype.h | 166 ++++---- include/freetype/ftbbox.h | 5 +- include/freetype/ftcache.h | 54 +-- include/freetype/ftglyph.h | 44 +- include/freetype/ftimage.h | 76 ++-- include/freetype/ftlist.h | 53 ++- include/freetype/ftmac.h | 9 +- include/freetype/ftmm.h | 40 +- include/freetype/ftmodule.h | 50 ++- include/freetype/ftoutln.h | 70 ++-- include/freetype/ftrender.h | 77 ++-- include/freetype/ftsnames.h | 10 +- include/freetype/ftsynth.h | 14 +- include/freetype/ftsystem.h | 31 +- include/freetype/fttrigon.h | 408 +++++++++--------- include/freetype/tttables.h | 16 +- src/truetype/ttdriver.c | 55 +-- src/truetype/ttgload.c | 90 ++-- src/truetype/ttgload.h | 24 +- src/truetype/ttinterp.c | 798 ++++++++++++++++++------------------ src/truetype/ttinterp.h | 85 ++-- src/truetype/ttobjs.c | 58 +-- src/truetype/ttobjs.h | 50 +-- src/truetype/ttpload.c | 18 +- src/truetype/ttpload.h | 18 +- src/type1/t1afm.c | 38 +- src/type1/t1afm.h | 22 +- src/type1/t1driver.c | 35 +- src/type1/t1gload.c | 18 +- src/type1/t1gload.h | 16 +- src/type1/t1load.c | 149 ++++--- src/type1/t1load.h | 30 +- src/type1/t1objs.c | 24 +- src/type1/t1objs.h | 24 +- src/type1/t1parse.c | 32 +- src/type1/t1parse.h | 20 +- src/winfonts/winfnt.c | 3 +- 39 files changed, 1447 insertions(+), 1295 deletions(-) diff --git a/builds/unix/ftsystem.c b/builds/unix/ftsystem.c index dc6f9f42f..d684dda3b 100644 --- a/builds/unix/ftsystem.c +++ b/builds/unix/ftsystem.c @@ -17,7 +17,7 @@ #include -/* we use our special ftconfig.h file, not the standard one */ + /* we use our special ftconfig.h file, not the standard one */ #include #include FT_INTERNAL_DEBUG_H #include FT_SYSTEM_H @@ -48,8 +48,9 @@ #else extern #endif - int munmap( char* addr, - int len ); + int + munmap( char* addr, + int len ); #define MUNMAP_ARG_CAST char * diff --git a/builds/vms/ftsystem.c b/builds/vms/ftsystem.c index 0729df424..d684dda3b 100644 --- a/builds/vms/ftsystem.c +++ b/builds/vms/ftsystem.c @@ -48,8 +48,9 @@ #else extern #endif - int munmap( char* addr, - int len ); + int + munmap( char* addr, + int len ); #define MUNMAP_ARG_CAST char * diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index c9bc58a4f..d2ddd608d 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -825,7 +825,7 @@ FT_BEGIN_HEADER /* A bit-field constant, used to indicate that the font contains */ /* glyph names that can be retrieved through FT_Get_Glyph_Name(). */ /* */ -#define FT_FACE_FLAG_GLYPH_NAMES 0x200 +#define FT_FACE_FLAG_GLYPH_NAMES 0x200 /*************************************************************************/ @@ -838,7 +838,7 @@ FT_BEGIN_HEADER /* a face's stream was provided by the client application and should */ /* not be destroyed by FT_Done_Face(). */ /* */ -#define FT_FACE_FLAG_EXTERNAL_STREAM 0x4000 +#define FT_FACE_FLAG_EXTERNAL_STREAM 0x4000 /* */ @@ -1330,7 +1330,8 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FT_Init_FreeType( FT_Library *alibrary ); + FT_EXPORT( FT_Error ) + FT_Init_FreeType( FT_Library *alibrary ); /*************************************************************************/ @@ -1348,7 +1349,8 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FT_Done_FreeType( FT_Library library ); + FT_EXPORT( FT_Error ) + FT_Done_FreeType( FT_Library library ); /*************************************************************************/ @@ -1505,10 +1507,11 @@ FT_BEGIN_HEADER /* `aface'. Its return value should be 0 if the font format is */ /* recognized, or non-zero if not. */ /* */ - FT_EXPORT( FT_Error ) FT_New_Face( FT_Library library, - const char* filepathname, - FT_Long face_index, - FT_Face *aface ); + FT_EXPORT( FT_Error ) + FT_New_Face( FT_Library library, + const char* filepathname, + FT_Long face_index, + FT_Face *aface ); /*************************************************************************/ @@ -1552,11 +1555,12 @@ FT_BEGIN_HEADER /* `aface'. Its return value should be 0 if the font format is */ /* recognized, or non-zero if not. */ /* */ - FT_EXPORT( FT_Error ) FT_New_Memory_Face( FT_Library library, - const FT_Byte* file_base, - FT_Long file_size, - FT_Long face_index, - FT_Face *aface ); + FT_EXPORT( FT_Error ) + FT_New_Memory_Face( FT_Library library, + const FT_Byte* file_base, + FT_Long file_size, + FT_Long face_index, + FT_Face *aface ); /*************************************************************************/ @@ -1595,10 +1599,11 @@ FT_BEGIN_HEADER /* `*face'. Its return value should be 0 if the font format is */ /* recognized, or non-zero if not. */ /* */ - FT_EXPORT( FT_Error ) FT_Open_Face( FT_Library library, - FT_Open_Args* args, - FT_Long face_index, - FT_Face *aface ); + FT_EXPORT( FT_Error ) + FT_Open_Face( FT_Library library, + FT_Open_Args* args, + FT_Long face_index, + FT_Face *aface ); /*************************************************************************/ @@ -1633,8 +1638,9 @@ FT_BEGIN_HEADER /* when invoking this function. Most drivers simply do not implement */ /* file attachments. */ /* */ - FT_EXPORT( FT_Error ) FT_Attach_File( FT_Face face, - const char* filepathname ); + FT_EXPORT( FT_Error ) + FT_Attach_File( FT_Face face, + const char* filepathname ); /*************************************************************************/ @@ -1664,8 +1670,9 @@ FT_BEGIN_HEADER /* when invoking this function. Most drivers simply do not implement */ /* file attachments. */ /* */ - FT_EXPORT( FT_Error ) FT_Attach_Stream( FT_Face face, - FT_Open_Args* parameters ); + FT_EXPORT( FT_Error ) + FT_Attach_Stream( FT_Face face, + FT_Open_Args* parameters ); /*************************************************************************/ @@ -1683,7 +1690,8 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FT_Done_Face( FT_Face face ); + FT_EXPORT( FT_Error ) + FT_Done_Face( FT_Face face ); /*************************************************************************/ @@ -1720,11 +1728,12 @@ FT_BEGIN_HEADER /* When dealing with fixed-size faces (i.e., non-scalable formats), */ /* use the function FT_Set_Pixel_Sizes(). */ /* */ - FT_EXPORT( FT_Error ) FT_Set_Char_Size( FT_Face face, - FT_F26Dot6 char_width, - FT_F26Dot6 char_height, - FT_UInt horz_resolution, - FT_UInt vert_resolution ); + FT_EXPORT( FT_Error ) + FT_Set_Char_Size( FT_Face face, + FT_F26Dot6 char_width, + FT_F26Dot6 char_height, + FT_UInt horz_resolution, + FT_UInt vert_resolution ); /*************************************************************************/ @@ -1766,9 +1775,10 @@ FT_BEGIN_HEADER /* guarantee in any way that you will get glyph bitmaps that all fit */ /* within an 8x8 cell (sometimes even far from it). */ /* */ - FT_EXPORT( FT_Error ) FT_Set_Pixel_Sizes( FT_Face face, - FT_UInt pixel_width, - FT_UInt pixel_height ); + FT_EXPORT( FT_Error ) + FT_Set_Pixel_Sizes( FT_Face face, + FT_UInt pixel_width, + FT_UInt pixel_height ); /*************************************************************************/ @@ -1805,9 +1815,10 @@ FT_BEGIN_HEADER /* Note that this also transforms the `face.glyph.advance' field, but */ /* *not* the values in `face.glyph.metrics'. */ /* */ - FT_EXPORT( FT_Error ) FT_Load_Glyph( FT_Face face, - FT_UInt glyph_index, - FT_Int load_flags ); + FT_EXPORT( FT_Error ) + FT_Load_Glyph( FT_Face face, + FT_UInt glyph_index, + FT_Int load_flags ); /*************************************************************************/ @@ -1849,9 +1860,10 @@ FT_BEGIN_HEADER /* Note that this also transforms the `face.glyph.advance' field, but */ /* *not* the values in `face.glyph.metrics'. */ /* */ - FT_EXPORT( FT_Error ) FT_Load_Char( FT_Face face, - FT_ULong char_code, - FT_Int load_flags ); + FT_EXPORT( FT_Error ) + FT_Load_Char( FT_Face face, + FT_ULong char_code, + FT_Int load_flags ); /*************************************************************************/ @@ -2018,7 +2030,7 @@ FT_BEGIN_HEADER /* the glyph loader should not try to transform the loaded glyph */ /* image. */ /* */ -#define FT_LOAD_IGNORE_TRANSFORM 2048 +#define FT_LOAD_IGNORE_TRANSFORM 2048 /*************************************************************************/ @@ -2045,7 +2057,7 @@ FT_BEGIN_HEADER /* the function should return the linearly scaled metrics expressed */ /* in original font units, instead of the default 16.16 pixel values. */ /* */ -#define FT_LOAD_LINEAR_DESIGN 8192 +#define FT_LOAD_LINEAR_DESIGN 8192 /*************************************************************************/ @@ -2087,9 +2099,10 @@ FT_BEGIN_HEADER /* the transformation and is performed on the character size given in */ /* the last call to FT_Set_Char_Sizes() or FT_Set_Pixel_Sizes(). */ /* */ - FT_EXPORT( void ) FT_Set_Transform( FT_Face face, - FT_Matrix* matrix, - FT_Vector* delta ); + FT_EXPORT( void ) + FT_Set_Transform( FT_Face face, + FT_Matrix* matrix, + FT_Vector* delta ); /*************************************************************************/ @@ -2149,8 +2162,9 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FT_Render_Glyph( FT_GlyphSlot slot, - FT_UInt render_mode ); + FT_EXPORT( FT_Error ) + FT_Render_Glyph( FT_GlyphSlot slot, + FT_UInt render_mode ); /*************************************************************************/ @@ -2214,11 +2228,12 @@ FT_BEGIN_HEADER /* kernings, are out of the scope of this API function -- they can be */ /* implemented through format-specific interfaces. */ /* */ - FT_EXPORT( FT_Error ) FT_Get_Kerning( FT_Face face, - FT_UInt left_glyph, - FT_UInt right_glyph, - FT_UInt kern_mode, - FT_Vector *akerning ); + FT_EXPORT( FT_Error ) + FT_Get_Kerning( FT_Face face, + FT_UInt left_glyph, + FT_UInt right_glyph, + FT_UInt kern_mode, + FT_Vector *akerning ); /*************************************************************************/ @@ -2257,10 +2272,11 @@ FT_BEGIN_HEADER /* macro FT_CONFIG_OPTION_NO_GLYPH_NAMES is defined in */ /* `include/freetype/config/ftoptions.h' */ /* */ - FT_EXPORT( FT_Error ) FT_Get_Glyph_Name( FT_Face face, - FT_UInt glyph_index, - FT_Pointer buffer, - FT_UInt buffer_max ); + FT_EXPORT( FT_Error ) + FT_Get_Glyph_Name( FT_Face face, + FT_UInt glyph_index, + FT_Pointer buffer, + FT_UInt buffer_max ); /*************************************************************************/ @@ -2285,8 +2301,9 @@ FT_BEGIN_HEADER /* This function will return an error if no charmap in the face */ /* corresponds to the encoding queried here. */ /* */ - FT_EXPORT( FT_Error ) FT_Select_Charmap( FT_Face face, - FT_Encoding encoding ); + FT_EXPORT( FT_Error ) + FT_Select_Charmap( FT_Face face, + FT_Encoding encoding ); /*************************************************************************/ @@ -2312,8 +2329,9 @@ FT_BEGIN_HEADER /* the face (i.e., if it is not listed in the face->charmaps[] */ /* table). */ /* */ - FT_EXPORT( FT_Error ) FT_Set_Charmap( FT_Face face, - FT_CharMap charmap ); + FT_EXPORT( FT_Error ) + FT_Set_Charmap( FT_Face face, + FT_CharMap charmap ); /*************************************************************************/ @@ -2333,8 +2351,9 @@ FT_BEGIN_HEADER /* */ /* The glyph index. 0 means `undefined character code'. */ /* */ - FT_EXPORT( FT_UInt ) FT_Get_Char_Index( FT_Face face, - FT_ULong charcode ); + FT_EXPORT( FT_UInt ) + FT_Get_Char_Index( FT_Face face, + FT_ULong charcode ); /*************************************************************************/ @@ -2389,9 +2408,10 @@ FT_BEGIN_HEADER /* divide by zero; it simply returns `MaxInt' or `MinInt' depending */ /* on the signs of `a' and `b'. */ /* */ - FT_EXPORT( FT_Long ) FT_MulDiv( FT_Long a, - FT_Long b, - FT_Long c ); + FT_EXPORT( FT_Long ) + FT_MulDiv( FT_Long a, + FT_Long b, + FT_Long c ); /*************************************************************************/ @@ -2423,8 +2443,9 @@ FT_BEGIN_HEADER /* _second_ argument of this function; this can make a great */ /* difference. */ /* */ - FT_EXPORT( FT_Long ) FT_MulFix( FT_Long a, - FT_Long b ); + FT_EXPORT( FT_Long ) + FT_MulFix( FT_Long a, + FT_Long b ); /*************************************************************************/ @@ -2450,8 +2471,9 @@ FT_BEGIN_HEADER /* 32 bits, then the division is computed directly. Otherwise, we */ /* use a specialized version of the old FT_MulDiv64(). */ /* */ - FT_EXPORT( FT_Long ) FT_DivFix( FT_Long a, - FT_Long b ); + FT_EXPORT( FT_Long ) + FT_DivFix( FT_Long a, + FT_Long b ); /*************************************************************************/ @@ -2468,7 +2490,8 @@ FT_BEGIN_HEADER /* */ /* The result of `(a + 0x8000) & -0x10000'. */ /* */ - FT_EXPORT( FT_Fixed ) FT_RoundFix( FT_Fixed a ); + FT_EXPORT( FT_Fixed ) + FT_RoundFix( FT_Fixed a ); /*************************************************************************/ @@ -2486,7 +2509,8 @@ FT_BEGIN_HEADER /* */ /* The result of `(a + 0x10000 - 1) & -0x10000'. */ /* */ - FT_EXPORT( FT_Fixed ) FT_CeilFix( FT_Fixed a ); + FT_EXPORT( FT_Fixed ) + FT_CeilFix( FT_Fixed a ); /*************************************************************************/ @@ -2504,7 +2528,8 @@ FT_BEGIN_HEADER /* */ /* The result of `a & -0x10000'. */ /* */ - FT_EXPORT( FT_Fixed ) FT_FloorFix( FT_Fixed a ); + FT_EXPORT( FT_Fixed ) + FT_FloorFix( FT_Fixed a ); /*************************************************************************/ @@ -2524,8 +2549,9 @@ FT_BEGIN_HEADER /* */ /* The result is undefined if either `vector' or `matrix' is invalid. */ /* */ - FT_EXPORT( void ) FT_Vector_Transform( FT_Vector* vec, - FT_Matrix* matrix ); + FT_EXPORT( void ) + FT_Vector_Transform( FT_Vector* vec, + FT_Matrix* matrix ); /* */ diff --git a/include/freetype/ftbbox.h b/include/freetype/ftbbox.h index c2259d984..a7d0df2ed 100644 --- a/include/freetype/ftbbox.h +++ b/include/freetype/ftbbox.h @@ -67,8 +67,9 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FT_Outline_Get_BBox( FT_Outline* outline, - FT_BBox *abbox ); + FT_EXPORT( FT_Error ) + FT_Outline_Get_BBox( FT_Outline* outline, + FT_BBox *abbox ); /* */ diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h index 64d0c44d1..43fffe7d1 100644 --- a/include/freetype/ftcache.h +++ b/include/freetype/ftcache.h @@ -110,10 +110,11 @@ FT_BEGIN_HEADER /* face object, like creating a new FT_Size for it, or setting a */ /* transformation through FT_Set_Transform()! */ /* */ - typedef FT_Error (*FTC_Face_Requester)( FTC_FaceID face_id, - FT_Library library, - FT_Pointer request_data, - FT_Face* aface ); + typedef FT_Error + (*FTC_Face_Requester)( FTC_FaceID face_id, + FT_Library library, + FT_Pointer request_data, + FT_Face* aface ); /*************************************************************************/ @@ -209,13 +210,14 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FTC_Manager_New( FT_Library library, - FT_UInt max_faces, - FT_UInt max_sizes, - FT_ULong max_bytes, - FTC_Face_Requester requester, - FT_Pointer req_data, - FTC_Manager *amanager ); + FT_EXPORT( FT_Error ) + FTC_Manager_New( FT_Library library, + FT_UInt max_faces, + FT_UInt max_sizes, + FT_ULong max_bytes, + FTC_Face_Requester requester, + FT_Pointer req_data, + FTC_Manager *amanager ); /*************************************************************************/ @@ -230,7 +232,8 @@ FT_BEGIN_HEADER /* */ /* manager :: A handle to the manager. */ /* */ - FT_EXPORT( void ) FTC_Manager_Reset( FTC_Manager manager ); + FT_EXPORT( void ) + FTC_Manager_Reset( FTC_Manager manager ); /*************************************************************************/ @@ -244,7 +247,8 @@ FT_BEGIN_HEADER /* */ /* manager :: A handle to the target cache manager object. */ /* */ - FT_EXPORT( void ) FTC_Manager_Done( FTC_Manager manager ); + FT_EXPORT( void ) + FTC_Manager_Done( FTC_Manager manager ); /*************************************************************************/ @@ -279,9 +283,10 @@ FT_BEGIN_HEADER /* the FT_Set_Transform() function) on a returned face! If you need */ /* to transform glyphs, do it yourself after glyph loading. */ /* */ - FT_EXPORT( FT_Error ) FTC_Manager_Lookup_Face( FTC_Manager manager, - FTC_FaceID face_id, - FT_Face *aface ); + FT_EXPORT( FT_Error ) + FTC_Manager_Lookup_Face( FTC_Manager manager, + FTC_FaceID face_id, + FT_Face *aface ); /*************************************************************************/ @@ -323,10 +328,11 @@ FT_BEGIN_HEADER /* The returned size object is the face's current size, which means */ /* that you can call FT_Load_Glyph() with the face if you need to. */ /* */ - FT_EXPORT( FT_Error ) FTC_Manager_Lookup_Size( FTC_Manager manager, - FTC_Font font, - FT_Face *aface, - FT_Size *asize ); + FT_EXPORT( FT_Error ) + FTC_Manager_Lookup_Size( FTC_Manager manager, + FTC_Font font, + FT_Face *aface, + FT_Size *asize ); /* a cache class is used to describe a unique cache type to the manager */ @@ -335,10 +341,10 @@ FT_BEGIN_HEADER /* this must be used internally for the moment */ - FT_EXPORT( FT_Error ) FTC_Manager_Register_Cache( - FTC_Manager manager, - FTC_Cache_Class* clazz, - FTC_Cache *acache ); + FT_EXPORT( FT_Error ) + FTC_Manager_Register_Cache( FTC_Manager manager, + FTC_Cache_Class* clazz, + FTC_Cache *acache ); /* */ diff --git a/include/freetype/ftglyph.h b/include/freetype/ftglyph.h index 0e27c0417..747cea1ab 100644 --- a/include/freetype/ftglyph.h +++ b/include/freetype/ftglyph.h @@ -182,8 +182,9 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FT_Get_Glyph( FT_GlyphSlot slot, - FT_Glyph *aglyph ); + FT_EXPORT( FT_Error ) + FT_Get_Glyph( FT_GlyphSlot slot, + FT_Glyph *aglyph ); /*************************************************************************/ @@ -204,8 +205,9 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FT_Glyph_Copy( FT_Glyph source, - FT_Glyph *target ); + FT_EXPORT( FT_Error ) + FT_Glyph_Copy( FT_Glyph source, + FT_Glyph *target ); /*************************************************************************/ @@ -233,9 +235,10 @@ FT_BEGIN_HEADER /* The 2x2 transformation matrix is also applied to the glyph's */ /* advance vector. */ /* */ - FT_EXPORT( FT_Error ) FT_Glyph_Transform( FT_Glyph glyph, - FT_Matrix* matrix, - FT_Vector* delta ); + FT_EXPORT( FT_Error ) + FT_Glyph_Transform( FT_Glyph glyph, + FT_Matrix* matrix, + FT_Vector* delta ); /* */ @@ -311,9 +314,10 @@ FT_BEGIN_HEADER }; - FT_EXPORT( void ) FT_Glyph_Get_CBox( FT_Glyph glyph, - FT_UInt bbox_mode, - FT_BBox *acbox ); + FT_EXPORT( void ) + FT_Glyph_Get_CBox( FT_Glyph glyph, + FT_UInt bbox_mode, + FT_BBox *acbox ); /*************************************************************************/ @@ -387,10 +391,11 @@ FT_BEGIN_HEADER /* This function will always fail if the glyph's format isn't */ /* scalable. */ /* */ - FT_EXPORT( FT_Error ) FT_Glyph_To_Bitmap( FT_Glyph* the_glyph, - FT_ULong render_mode, - FT_Vector* origin, - FT_Bool destroy ); + FT_EXPORT( FT_Error ) + FT_Glyph_To_Bitmap( FT_Glyph* the_glyph, + FT_ULong render_mode, + FT_Vector* origin, + FT_Bool destroy ); /*************************************************************************/ @@ -404,7 +409,8 @@ FT_BEGIN_HEADER /* */ /* glyph :: A handle to the target glyph object. */ /* */ - FT_EXPORT( void ) FT_Done_Glyph( FT_Glyph glyph ); + FT_EXPORT( void ) + FT_Done_Glyph( FT_Glyph glyph ); /* other helpful functions */ @@ -434,8 +440,9 @@ FT_BEGIN_HEADER /* */ /* The result is undefined if either `a' or `b' is zero. */ /* */ - FT_EXPORT( void ) FT_Matrix_Multiply( FT_Matrix* a, - FT_Matrix* b ); + FT_EXPORT( void ) + FT_Matrix_Multiply( FT_Matrix* a, + FT_Matrix* b ); /*************************************************************************/ @@ -453,7 +460,8 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FT_Matrix_Invert( FT_Matrix* matrix ); + FT_EXPORT( FT_Error ) + FT_Matrix_Invert( FT_Matrix* matrix ); /* */ diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h index 2f8ab7e09..5b25999d2 100644 --- a/include/freetype/ftimage.h +++ b/include/freetype/ftimage.h @@ -424,8 +424,9 @@ FT_BEGIN_HEADER /* */ /* Error code. 0 means success. */ /* */ - typedef int (*FT_Outline_MoveTo_Func)( FT_Vector* to, - void* user ); + typedef int + (*FT_Outline_MoveTo_Func)( FT_Vector* to, + void* user ); /*************************************************************************/ @@ -448,8 +449,9 @@ FT_BEGIN_HEADER /* */ /* Error code. 0 means success. */ /* */ - typedef int (*FT_Outline_LineTo_Func)( FT_Vector* to, - void* user ); + typedef int + (*FT_Outline_LineTo_Func)( FT_Vector* to, + void* user ); /*************************************************************************/ @@ -476,9 +478,10 @@ FT_BEGIN_HEADER /* */ /* Error code. 0 means success. */ /* */ - typedef int (*FT_Outline_ConicTo_Func)( FT_Vector* control, - FT_Vector* to, - void* user ); + typedef int + (*FT_Outline_ConicTo_Func)( FT_Vector* control, + FT_Vector* to, + void* user ); /*************************************************************************/ @@ -505,10 +508,11 @@ FT_BEGIN_HEADER /* */ /* Error code. 0 means success. */ /* */ - typedef int (*FT_Outline_CubicTo_Func)( FT_Vector* control1, - FT_Vector* control2, - FT_Vector* to, - void* user ); + typedef int + (*FT_Outline_CubicTo_Func)( FT_Vector* control1, + FT_Vector* control2, + FT_Vector* to, + void* user ); /*************************************************************************/ @@ -750,10 +754,11 @@ FT_BEGIN_HEADER /* Otherwise, the callback is only called once per scan-line, and */ /* only for those scanlines that do have `gray' pixels on them. */ /* */ - typedef void (*FT_Raster_Span_Func)( int y, - int count, - FT_Span* spans, - void* user ); + typedef void + (*FT_Raster_Span_Func)( int y, + int count, + FT_Span* spans, + void* user ); /*************************************************************************/ @@ -777,9 +782,10 @@ FT_BEGIN_HEADER /* */ /* 1 if the pixel is `set', 0 otherwise. */ /* */ - typedef int (*FT_Raster_BitTest_Func)( int y, - int x, - void* user ); + typedef int + (*FT_Raster_BitTest_Func)( int y, + int x, + void* user ); /*************************************************************************/ @@ -802,9 +808,10 @@ FT_BEGIN_HEADER /* */ /* 1 if the pixel is `set', 0 otherwise. */ /* */ - typedef void (*FT_Raster_BitSet_Func)( int y, - int x, - void* user ); + typedef void + (*FT_Raster_BitSet_Func)( int y, + int x, + void* user ); /*************************************************************************/ @@ -944,8 +951,9 @@ FT_BEGIN_HEADER /* FreeType memory allocator. However, this field can be completely */ /* ignored by a given raster implementation. */ /* */ - typedef int (*FT_Raster_New_Func)( void* memory, - FT_Raster* raster ); + typedef int + (*FT_Raster_New_Func)( void* memory, + FT_Raster* raster ); /*************************************************************************/ @@ -959,7 +967,8 @@ FT_BEGIN_HEADER /* */ /* raster :: A handle to the raster object. */ /* */ - typedef void (*FT_Raster_Done_Func)( FT_Raster raster ); + typedef void + (*FT_Raster_Done_Func)( FT_Raster raster ); /*************************************************************************/ @@ -989,9 +998,10 @@ FT_BEGIN_HEADER /* passed to the raster constructor). However, this is not */ /* recommended for efficiency purposes. */ /* */ - typedef void (*FT_Raster_Reset_Func)( FT_Raster raster, - unsigned char* pool_base, - unsigned long pool_size ); + typedef void + (*FT_Raster_Reset_Func)( FT_Raster raster, + unsigned char* pool_base, + unsigned long pool_size ); /*************************************************************************/ @@ -1012,9 +1022,10 @@ FT_BEGIN_HEADER /* */ /* args :: A pointer to the new mode/property to use. */ /* */ - typedef int (*FT_Raster_Set_Mode_Func)( FT_Raster raster, - unsigned long mode, - void* args ); + typedef int + (*FT_Raster_Set_Mode_Func)( FT_Raster raster, + unsigned long mode, + void* args ); /*************************************************************************/ @@ -1051,8 +1062,9 @@ FT_BEGIN_HEADER /* examples of distinct implementations which support direct */ /* composition). */ /* */ - typedef int (*FT_Raster_Render_Func)( FT_Raster raster, - FT_Raster_Params* params ); + typedef int + (*FT_Raster_Render_Func)( FT_Raster raster, + FT_Raster_Params* params ); /*************************************************************************/ diff --git a/include/freetype/ftlist.h b/include/freetype/ftlist.h index 814ef0858..a8bbf5062 100644 --- a/include/freetype/ftlist.h +++ b/include/freetype/ftlist.h @@ -84,8 +84,9 @@ FT_BEGIN_HEADER /* */ /* List node. NULL if it wasn't found. */ /* */ - FT_EXPORT( FT_ListNode ) FT_List_Find( FT_List list, - void* data ); + FT_EXPORT( FT_ListNode ) + FT_List_Find( FT_List list, + void* data ); /*************************************************************************/ @@ -100,8 +101,9 @@ FT_BEGIN_HEADER /* list :: A pointer to the parent list. */ /* node :: The node to append. */ /* */ - FT_EXPORT( void ) FT_List_Add( FT_List list, - FT_ListNode node ); + FT_EXPORT( void ) + FT_List_Add( FT_List list, + FT_ListNode node ); /*************************************************************************/ @@ -116,8 +118,9 @@ FT_BEGIN_HEADER /* list :: A pointer to parent list. */ /* node :: The node to insert. */ /* */ - FT_EXPORT( void ) FT_List_Insert( FT_List list, - FT_ListNode node ); + FT_EXPORT( void ) + FT_List_Insert( FT_List list, + FT_ListNode node ); /*************************************************************************/ @@ -135,8 +138,9 @@ FT_BEGIN_HEADER /* */ /* list :: A pointer to the parent list. */ /* */ - FT_EXPORT( void ) FT_List_Remove( FT_List list, - FT_ListNode node ); + FT_EXPORT( void ) + FT_List_Remove( FT_List list, + FT_ListNode node ); /*************************************************************************/ @@ -152,8 +156,9 @@ FT_BEGIN_HEADER /* list :: A pointer to the parent list. */ /* node :: The node to move. */ /* */ - FT_EXPORT( void ) FT_List_Up( FT_List list, - FT_ListNode node ); + FT_EXPORT( void ) + FT_List_Up( FT_List list, + FT_ListNode node ); /*************************************************************************/ @@ -171,8 +176,9 @@ FT_BEGIN_HEADER /* user :: A typeless pointer passed to FT_List_Iterate(). */ /* Can be used to point to the iteration's state. */ /* */ - typedef FT_Error (*FT_List_Iterator)( FT_ListNode node, - void* user ); + typedef FT_Error + (*FT_List_Iterator)( FT_ListNode node, + void* user ); /*************************************************************************/ @@ -195,9 +201,10 @@ FT_BEGIN_HEADER /* */ /* The result (a FreeType error code) of the last iterator call. */ /* */ - FT_EXPORT( FT_Error ) FT_List_Iterate( FT_List list, - FT_List_Iterator iterator, - void* user ); + FT_EXPORT( FT_Error ) + FT_List_Iterate( FT_List list, + FT_List_Iterator iterator, + void* user ); /*************************************************************************/ @@ -218,9 +225,10 @@ FT_BEGIN_HEADER /* user :: A typeless pointer passed to FT_List_Iterate(). It can */ /* be used to point to the iteration's state. */ /* */ - typedef void (*FT_List_Destructor)( FT_Memory memory, - void* data, - void* user ); + typedef void + (*FT_List_Destructor)( FT_Memory memory, + void* data, + void* user ); /*************************************************************************/ @@ -242,10 +250,11 @@ FT_BEGIN_HEADER /* user :: A user-supplied field which is passed as the last */ /* argument to the destructor. */ /* */ - FT_EXPORT( void ) FT_List_Finalize( FT_List list, - FT_List_Destructor destroy, - FT_Memory memory, - void* user ); + FT_EXPORT( void ) + FT_List_Finalize( FT_List list, + FT_List_Destructor destroy, + FT_Memory memory, + void* user ); /* */ diff --git a/include/freetype/ftmac.h b/include/freetype/ftmac.h index 4c7f06938..c105f3290 100644 --- a/include/freetype/ftmac.h +++ b/include/freetype/ftmac.h @@ -85,10 +85,11 @@ FT_BEGIN_HEADER /* error = FT_New_Face_From_FOND( library, fond, 0, &face ); */ /* } */ /* */ - FT_EXPORT( FT_Error ) FT_New_Face_From_FOND( FT_Library library, - Handle fond, - FT_Long face_index, - FT_Face *aface ); + FT_EXPORT( FT_Error ) + FT_New_Face_From_FOND( FT_Library library, + Handle fond, + FT_Long face_index, + FT_Face *aface ); /* */ diff --git a/include/freetype/ftmm.h b/include/freetype/ftmm.h index 137ce8491..f1e420317 100644 --- a/include/freetype/ftmm.h +++ b/include/freetype/ftmm.h @@ -100,16 +100,19 @@ FT_BEGIN_HEADER /* */ - typedef FT_Error (*FT_Get_MM_Func)( FT_Face face, - FT_Multi_Master* master ); + typedef FT_Error + (*FT_Get_MM_Func)( FT_Face face, + FT_Multi_Master* master ); - typedef FT_Error (*FT_Set_MM_Design_Func)( FT_Face face, - FT_UInt num_coords, - FT_Long* coords ); + typedef FT_Error + (*FT_Set_MM_Design_Func)( FT_Face face, + FT_UInt num_coords, + FT_Long* coords ); - typedef FT_Error (*FT_Set_MM_Blend_Func)( FT_Face face, - FT_UInt num_coords, - FT_Long* coords ); + typedef FT_Error + (*FT_Set_MM_Blend_Func)( FT_Face face, + FT_UInt num_coords, + FT_Long* coords ); /*************************************************************************/ @@ -129,8 +132,9 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FT_Get_Multi_Master( FT_Face face, - FT_Multi_Master *amaster ); + FT_EXPORT( FT_Error ) + FT_Get_Multi_Master( FT_Face face, + FT_Multi_Master *amaster ); /*************************************************************************/ @@ -154,10 +158,10 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FT_Set_MM_Design_Coordinates( - FT_Face face, - FT_UInt num_coords, - FT_Long* coords ); + FT_EXPORT( FT_Error ) + FT_Set_MM_Design_Coordinates( FT_Face face, + FT_UInt num_coords, + FT_Long* coords ); /*************************************************************************/ @@ -182,10 +186,10 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FT_Set_MM_Blend_Coordinates( - FT_Face face, - FT_UInt num_coords, - FT_Fixed* coords ); + FT_EXPORT( FT_Error ) + FT_Set_MM_Blend_Coordinates( FT_Face face, + FT_UInt num_coords, + FT_Fixed* coords ); /* */ diff --git a/include/freetype/ftmodule.h b/include/freetype/ftmodule.h index 3fcc95e8f..be219ae8e 100644 --- a/include/freetype/ftmodule.h +++ b/include/freetype/ftmodule.h @@ -63,14 +63,18 @@ FT_BEGIN_HEADER } FT_Module_Flags; - typedef void (*FT_Module_Interface)( void ); + typedef void + (*FT_Module_Interface)( void ); - typedef FT_Error (*FT_Module_Constructor)( FT_Module module ); + typedef FT_Error + (*FT_Module_Constructor)( FT_Module module ); - typedef void (*FT_Module_Destructor)( FT_Module module ); + typedef void + (*FT_Module_Destructor)( FT_Module module ); - typedef FT_Module_Interface (*FT_Module_Requester)( FT_Module module, - const char* name ); + typedef FT_Module_Interface + (*FT_Module_Requester)( FT_Module module, + const char* name ); /*************************************************************************/ @@ -142,8 +146,9 @@ FT_BEGIN_HEADER /* An error will be returned if a module already exists by that name, */ /* or if the module requires a version of FreeType that is too great. */ /* */ - FT_EXPORT( FT_Error ) FT_Add_Module( FT_Library library, - const FT_Module_Class* clazz ); + FT_EXPORT( FT_Error ) + FT_Add_Module( FT_Library library, + const FT_Module_Class* clazz ); /*************************************************************************/ @@ -166,8 +171,9 @@ FT_BEGIN_HEADER /* You should better be familiar with FreeType internals to know */ /* which module to look for :-) */ /* */ - FT_EXPORT( FT_Module ) FT_Get_Module( FT_Library library, - const char* module_name ); + FT_EXPORT( FT_Module ) + FT_Get_Module( FT_Library library, + const char* module_name ); /*************************************************************************/ @@ -190,8 +196,9 @@ FT_BEGIN_HEADER /* */ /* The module object is destroyed by the function in case of success. */ /* */ - FT_EXPORT( FT_Error ) FT_Remove_Module( FT_Library library, - FT_Module module ); + FT_EXPORT( FT_Error ) + FT_Remove_Module( FT_Library library, + FT_Module module ); /*************************************************************************/ @@ -213,8 +220,9 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FT_New_Library( FT_Memory memory, - FT_Library *alibrary ); + FT_EXPORT( FT_Error ) + FT_New_Library( FT_Memory memory, + FT_Library *alibrary ); /*************************************************************************/ @@ -232,11 +240,13 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FT_Done_Library( FT_Library library ); + FT_EXPORT( FT_Error ) + FT_Done_Library( FT_Library library ); - typedef void (*FT_DebugHook_Func)( void* arg ); + typedef void + (*FT_DebugHook_Func)( void* arg ); /*************************************************************************/ @@ -262,9 +272,10 @@ FT_BEGIN_HEADER /* Currently, four debug hook slots are available, but only two (for */ /* the TrueType and the Type 1 interpreter) are defined. */ /* */ - FT_EXPORT( void ) FT_Set_Debug_Hook( FT_Library library, - FT_UInt hook_index, - FT_DebugHook_Func debug_hook ); + FT_EXPORT( void ) + FT_Set_Debug_Hook( FT_Library library, + FT_UInt hook_index, + FT_DebugHook_Func debug_hook ); @@ -281,7 +292,8 @@ FT_BEGIN_HEADER /* */ /* library :: A handle to a new library object. */ /* */ - FT_EXPORT( void ) FT_Add_Default_Modules( FT_Library library ); + FT_EXPORT( void ) + FT_Add_Default_Modules( FT_Library library ); /* */ diff --git a/include/freetype/ftoutln.h b/include/freetype/ftoutln.h index da4d2cb6a..c475baa23 100644 --- a/include/freetype/ftoutln.h +++ b/include/freetype/ftoutln.h @@ -95,10 +95,10 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means sucess. */ /* */ - FT_EXPORT( FT_Error ) FT_Outline_Decompose( - FT_Outline* outline, - const FT_Outline_Funcs* interface, - void* user ); + FT_EXPORT( FT_Error ) + FT_Outline_Decompose( FT_Outline* outline, + const FT_Outline_Funcs* interface, + void* user ); /*************************************************************************/ @@ -130,14 +130,15 @@ FT_BEGIN_HEADER /* The reason why this function takes a `library' parameter is simply */ /* to use the library's memory allocator. */ /* */ - FT_EXPORT( FT_Error ) FT_Outline_New( FT_Library library, - FT_UInt numPoints, - FT_Int numContours, - FT_Outline *anoutline ); + FT_EXPORT( FT_Error ) + FT_Outline_New( FT_Library library, + FT_UInt numPoints, + FT_Int numContours, + FT_Outline *anoutline ); - FT_EXPORT( FT_Error ) FT_Outline_New_Internal( - FT_Memory memory, + FT_EXPORT( FT_Error ) + FT_Outline_New_Internal( FT_Memory memory, FT_UInt numPoints, FT_Int numContours, FT_Outline *anoutline ); @@ -167,12 +168,14 @@ FT_BEGIN_HEADER /* The reason why this function takes an `library' parameter is */ /* simply to use FT_Free(). */ /* */ - FT_EXPORT( FT_Error ) FT_Outline_Done( FT_Library library, - FT_Outline* outline ); + FT_EXPORT( FT_Error ) + FT_Outline_Done( FT_Library library, + FT_Outline* outline ); - FT_EXPORT( FT_Error ) FT_Outline_Done_Internal( FT_Memory memory, - FT_Outline* outline ); + FT_EXPORT( FT_Error ) + FT_Outline_Done_Internal( FT_Memory memory, + FT_Outline* outline ); /*************************************************************************/ @@ -198,8 +201,9 @@ FT_BEGIN_HEADER /* */ /* acbox :: The outline's control box. */ /* */ - FT_EXPORT( void ) FT_Outline_Get_CBox( FT_Outline* outline, - FT_BBox *acbox ); + FT_EXPORT( void ) + FT_Outline_Get_CBox( FT_Outline* outline, + FT_BBox *acbox ); /*************************************************************************/ @@ -218,9 +222,10 @@ FT_BEGIN_HEADER /* */ /* yOffset :: The vertical offset. */ /* */ - FT_EXPORT( void ) FT_Outline_Translate( FT_Outline* outline, - FT_Pos xOffset, - FT_Pos yOffset ); + FT_EXPORT( void ) + FT_Outline_Translate( FT_Outline* outline, + FT_Pos xOffset, + FT_Pos yOffset ); /*************************************************************************/ @@ -242,8 +247,9 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FT_Outline_Copy( FT_Outline* source, - FT_Outline *target ); + FT_EXPORT( FT_Error ) + FT_Outline_Copy( FT_Outline* source, + FT_Outline *target ); /*************************************************************************/ @@ -265,8 +271,9 @@ FT_BEGIN_HEADER /* You can use FT_Outline_Translate() if you need to translate the */ /* outline's points. */ /* */ - FT_EXPORT( void ) FT_Outline_Transform( FT_Outline* outline, - FT_Matrix* matrix ); + FT_EXPORT( void ) + FT_Outline_Transform( FT_Outline* outline, + FT_Matrix* matrix ); /*************************************************************************/ @@ -288,7 +295,8 @@ FT_BEGIN_HEADER /* It shouldn't be used by a normal client application, unless it */ /* knows what it is doing. */ /* */ - FT_EXPORT( void ) FT_Outline_Reverse( FT_Outline* outline ); + FT_EXPORT( void ) + FT_Outline_Reverse( FT_Outline* outline ); /*************************************************************************/ @@ -317,9 +325,10 @@ FT_BEGIN_HEADER /* */ /* It will use the raster correponding to the default glyph format. */ /* */ - FT_EXPORT( FT_Error ) FT_Outline_Get_Bitmap( FT_Library library, - FT_Outline* outline, - FT_Bitmap *abitmap ); + FT_EXPORT( FT_Error ) + FT_Outline_Get_Bitmap( FT_Library library, + FT_Outline* outline, + FT_Bitmap *abitmap ); /*************************************************************************/ @@ -353,9 +362,10 @@ FT_BEGIN_HEADER /* converter is called, which means that the value you give to it is */ /* actually ignored. */ /* */ - FT_EXPORT( FT_Error ) FT_Outline_Render( FT_Library library, - FT_Outline* outline, - FT_Raster_Params* params ); + FT_EXPORT( FT_Error ) + FT_Outline_Render( FT_Library library, + FT_Outline* outline, + FT_Raster_Params* params ); /* */ diff --git a/include/freetype/ftrender.h b/include/freetype/ftrender.h index c6a0d2e77..4cf824fc5 100644 --- a/include/freetype/ftrender.h +++ b/include/freetype/ftrender.h @@ -37,24 +37,31 @@ FT_BEGIN_HEADER /* create a new glyph object */ - typedef FT_Error (*FT_Glyph_Init_Func) ( FT_Glyph glyph, - FT_GlyphSlot slot ); + typedef FT_Error + (*FT_Glyph_Init_Func)( FT_Glyph glyph, + FT_GlyphSlot slot ); /* destroys a given glyph object */ - typedef void (*FT_Glyph_Done_Func) ( FT_Glyph glyph ); + typedef void + (*FT_Glyph_Done_Func)( FT_Glyph glyph ); - typedef void (*FT_Glyph_Transform_Func)( FT_Glyph glyph, - FT_Matrix* matrix, - FT_Vector* delta ); + typedef void + (*FT_Glyph_Transform_Func)( FT_Glyph glyph, + FT_Matrix* matrix, + FT_Vector* delta ); - typedef void (*FT_Glyph_BBox_Func) ( FT_Glyph glyph, - FT_BBox* abbox ); + typedef void + (*FT_Glyph_BBox_Func)( FT_Glyph glyph, + FT_BBox* abbox ); - typedef FT_Error (*FT_Glyph_Copy_Func) ( FT_Glyph source, - FT_Glyph target ); + typedef FT_Error + (*FT_Glyph_Copy_Func)( FT_Glyph source, + FT_Glyph target ); + + typedef FT_Error + (*FT_Glyph_Prepare_Func)( FT_Glyph glyph, + FT_GlyphSlot slot ); - typedef FT_Error (*FT_Glyph_Prepare_Func) ( FT_Glyph glyph, - FT_GlyphSlot slot ); struct FT_Glyph_Class_ { @@ -69,23 +76,27 @@ FT_BEGIN_HEADER }; - typedef FT_Error (*FTRenderer_render) ( FT_Renderer renderer, - FT_GlyphSlot slot, - FT_UInt mode, - FT_Vector* origin ); + typedef FT_Error + (*FTRenderer_render)( FT_Renderer renderer, + FT_GlyphSlot slot, + FT_UInt mode, + FT_Vector* origin ); - typedef FT_Error (*FTRenderer_transform)( FT_Renderer renderer, - FT_GlyphSlot slot, - FT_Matrix* matrix, - FT_Vector* delta ); + typedef FT_Error + (*FTRenderer_transform)( FT_Renderer renderer, + FT_GlyphSlot slot, + FT_Matrix* matrix, + FT_Vector* delta ); - typedef void (*FTRenderer_getCBox) ( FT_Renderer renderer, - FT_GlyphSlot slot, - FT_BBox* cbox ); + typedef void + (*FTRenderer_getCBox)( FT_Renderer renderer, + FT_GlyphSlot slot, + FT_BBox* cbox ); - typedef FT_Error (*FTRenderer_setMode) ( FT_Renderer renderer, - FT_ULong mode_tag, - FT_Pointer mode_ptr ); + typedef FT_Error + (*FTRenderer_setMode)( FT_Renderer renderer, + FT_ULong mode_tag, + FT_Pointer mode_ptr ); /*************************************************************************/ @@ -152,8 +163,9 @@ FT_BEGIN_HEADER /* To add a new renderer, simply use FT_Add_Module(). To retrieve a */ /* renderer by its name, use FT_Get_Module(). */ /* */ - FT_EXPORT( FT_Renderer ) FT_Get_Renderer( FT_Library library, - FT_Glyph_Format format ); + FT_EXPORT( FT_Renderer ) + FT_Get_Renderer( FT_Library library, + FT_Glyph_Format format ); /*************************************************************************/ @@ -183,10 +195,11 @@ FT_BEGIN_HEADER /* */ /* This doesn't change the current renderer for other formats. */ /* */ - FT_EXPORT( FT_Error ) FT_Set_Renderer( FT_Library library, - FT_Renderer renderer, - FT_UInt num_params, - FT_Parameter* parameters ); + FT_EXPORT( FT_Error ) + FT_Set_Renderer( FT_Library library, + FT_Renderer renderer, + FT_UInt num_params, + FT_Parameter* parameters ); /* */ diff --git a/include/freetype/ftsnames.h b/include/freetype/ftsnames.h index b81b314d8..c429605e3 100644 --- a/include/freetype/ftsnames.h +++ b/include/freetype/ftsnames.h @@ -113,7 +113,8 @@ FT_BEGIN_HEADER /* */ /* The number of strings in the `name' table. */ /* */ - FT_EXPORT( FT_UInt ) FT_Get_Sfnt_Name_Count( FT_Face face ); + FT_EXPORT( FT_UInt ) + FT_Get_Sfnt_Name_Count( FT_Face face ); /*************************************************************************/ @@ -143,9 +144,10 @@ FT_BEGIN_HEADER /* `name' table entries, then do a loop until you get the right */ /* platform, encoding, and name ID. */ /* */ - FT_EXPORT( FT_Error ) FT_Get_Sfnt_Name( FT_Face face, - FT_UInt index, - FT_SfntName *aname ); + FT_EXPORT( FT_Error ) + FT_Get_Sfnt_Name( FT_Face face, + FT_UInt index, + FT_SfntName *aname ); /* */ diff --git a/include/freetype/ftsynth.h b/include/freetype/ftsynth.h index 902431902..9504cfb75 100644 --- a/include/freetype/ftsynth.h +++ b/include/freetype/ftsynth.h @@ -48,13 +48,15 @@ FT_BEGIN_HEADER /* This code is completely experimental -- use with care! */ /* It will probably be completely rewritten in the future */ /* or even integrated into the library. */ - FT_EXPORT( FT_Error ) FT_Outline_Embolden( FT_GlyphSlot original, - FT_Outline* outline, - FT_Pos* advance ); + FT_EXPORT( FT_Error ) + FT_Outline_Embolden( FT_GlyphSlot original, + FT_Outline* outline, + FT_Pos* advance ); - FT_EXPORT( FT_Error ) FT_Outline_Oblique( FT_GlyphSlot original, - FT_Outline* outline, - FT_Pos* advance ); + FT_EXPORT( FT_Error ) + FT_Outline_Oblique( FT_GlyphSlot original, + FT_Outline* outline, + FT_Pos* advance ); FT_END_HEADER diff --git a/include/freetype/ftsystem.h b/include/freetype/ftsystem.h index 151a80f6f..099961910 100644 --- a/include/freetype/ftsystem.h +++ b/include/freetype/ftsystem.h @@ -80,8 +80,9 @@ FT_BEGIN_HEADER /* @return: */ /* Address of new memory block. 0 in case of failure. */ /* */ - typedef void* (*FT_Alloc_Func)( FT_Memory memory, - long size ); + typedef void* + (*FT_Alloc_Func)( FT_Memory memory, + long size ); /*************************************************************************/ @@ -97,8 +98,9 @@ FT_BEGIN_HEADER /* */ /* block :: The address of the target memory block. */ /* */ - typedef void (*FT_Free_Func)( FT_Memory memory, - void* block ); + typedef void + (*FT_Free_Func)( FT_Memory memory, + void* block ); /*************************************************************************/ @@ -124,10 +126,11 @@ FT_BEGIN_HEADER /* @note: */ /* In case of error, the old block must still be available. */ /* */ - typedef void* (*FT_Realloc_Func)( FT_Memory memory, - long cur_size, - long new_size, - void* block ); + typedef void* + (*FT_Realloc_Func)( FT_Memory memory, + long cur_size, + long new_size, + void* block ); /*************************************************************************/ @@ -215,10 +218,11 @@ FT_BEGIN_HEADER /* This function might be called to perform a seek or skip operation */ /* with a `count' of 0. */ /* */ - typedef unsigned long (*FT_Stream_IO)( FT_Stream stream, - unsigned long offset, - unsigned char* buffer, - unsigned long count ); + typedef unsigned long + (*FT_Stream_IO)( FT_Stream stream, + unsigned long offset, + unsigned char* buffer, + unsigned long count ); /*************************************************************************/ @@ -232,7 +236,8 @@ FT_BEGIN_HEADER /* @input: */ /* stream :: A handle to the target stream. */ /* */ - typedef void (*FT_Stream_Close)( FT_Stream stream ); + typedef void + (*FT_Stream_Close)( FT_Stream stream ); /*************************************************************************/ diff --git a/include/freetype/fttrigon.h b/include/freetype/fttrigon.h index 391dcbbb3..c2356f723 100644 --- a/include/freetype/fttrigon.h +++ b/include/freetype/fttrigon.h @@ -25,235 +25,251 @@ FT_BEGIN_HEADER - /*************************************************************************** - * - * @section: - * computations - * - */ + /*************************************************************************/ + /* */ + /* @section: */ + /* computations */ + /* */ + /*************************************************************************/ - /*************************************************************************** - * - * @type: - * FT_Angle - * - * @description: - * This type is used to model angle values in FreeType. Note that - * the angle is a 16.16 fixed float value expressed in degrees. - */ + /*************************************************************************/ + /* */ + /* @type: */ + /* FT_Angle */ + /* */ + /* @description: */ + /* This type is used to model angle values in FreeType. Note that */ + /* the angle is a 16.16 fixed float value expressed in degrees. */ + /* */ typedef FT_Fixed FT_Angle; - /*************************************************************************** - * - * @macro: - * FT_ANGLE_PI - * - * @description: - * The angle pi expressed in @FT_Angle units. - */ + /*************************************************************************/ + /* */ + /* @macro: */ + /* FT_ANGLE_PI */ + /* */ + /* @description: */ + /* The angle pi expressed in @FT_Angle units. */ + /* */ #define FT_ANGLE_PI ( 180L << 16 ) - /*************************************************************************** - * - * @macro: - * FT_ANGLE_2PI - * - * @description: - * The angle 2*pi expressed in @FT_Angle units. - */ + /*************************************************************************/ + /* */ + /* @macro: */ + /* FT_ANGLE_2PI */ + /* */ + /* @description: */ + /* The angle 2*pi expressed in @FT_Angle units. */ + /* */ #define FT_ANGLE_2PI ( FT_ANGLE_PI * 2 ) - /*************************************************************************** - * - * @macro: - * FT_ANGLE_PI2 - * - * @description: - * The angle pi/2 expressed in @FT_Angle units. - */ + /*************************************************************************/ + /* */ + /* @macro: */ + /* FT_ANGLE_PI2 */ + /* */ + /* @description: */ + /* The angle pi/2 expressed in @FT_Angle units. */ + /* */ #define FT_ANGLE_PI2 ( FT_ANGLE_PI / 2 ) - /*************************************************************************** - * - * @macro: - * FT_ANGLE_PI4 - * - * @description: - * The angle pi/4 expressed in @FT_Angle units. - */ + /*************************************************************************/ + /* */ + /* @macro: */ + /* FT_ANGLE_PI4 */ + /* */ + /* @description: */ + /* The angle pi/4 expressed in @FT_Angle units. */ + /* */ #define FT_ANGLE_PI4 ( FT_ANGLE_PI / 4 ) - /*************************************************************************** - * - * @function: - * FT_Sin - * - * @description: - * Return the sinus of a given angle in fixed point format. - * - * @input: - * angle :: The input angle. - * - * @return: - * The sinus value. - * - * @note: - * If you need both the sinus and cosinus for a given angle, use the - * function @FT_Vector_Unit. - */ - FT_EXPORT( FT_Fixed ) FT_Sin( FT_Angle angle ); + /*************************************************************************/ + /* */ + /* @function: */ + /* FT_Sin */ + /* */ + /* @description: */ + /* Return the sinus of a given angle in fixed point format. */ + /* */ + /* @input: */ + /* angle :: The input angle. */ + /* */ + /* @return: */ + /* The sinus value. */ + /* */ + /* @note: */ + /* If you need both the sinus and cosinus for a given angle, use the */ + /* function @FT_Vector_Unit. */ + /* */ + FT_EXPORT( FT_Fixed ) + FT_Sin( FT_Angle angle ); - /*************************************************************************** - * - * @function: - * FT_Cos - * - * @description: - * Return the cosinus of a given angle in fixed point format. - * - * @input: - * angle :: The input angle. - * - * @return: - * The cosinus value. - * - * @note: - * If you need both the sinus and cosinus for a given angle, use the - * function @FT_Vector_Unit. - */ - FT_EXPORT( FT_Fixed ) FT_Cos( FT_Angle angle ); + /*************************************************************************/ + /* */ + /* @function: */ + /* FT_Cos */ + /* */ + /* @description: */ + /* Return the cosinus of a given angle in fixed point format. */ + /* */ + /* @input: */ + /* angle :: The input angle. */ + /* */ + /* @return: */ + /* The cosinus value. */ + /* */ + /* @note: */ + /* If you need both the sinus and cosinus for a given angle, use the */ + /* function @FT_Vector_Unit. */ + /* */ + FT_EXPORT( FT_Fixed ) + FT_Cos( FT_Angle angle ); - /*************************************************************************** - * - * @function: - * FT_Tan - * - * @description: - * Return the tangent of a given angle in fixed point format. - * - * @input: - * angle :: The input angle. - * - * @return: - * The tangent value. - */ - FT_EXPORT( FT_Fixed ) FT_Tan( FT_Angle angle ); + /*************************************************************************/ + /* */ + /* @function: */ + /* FT_Tan */ + /* */ + /* @description: */ + /* Return the tangent of a given angle in fixed point format. */ + /* */ + /* @input: */ + /* angle :: The input angle. */ + /* */ + /* @return: */ + /* The tangent value. */ + /* */ + FT_EXPORT( FT_Fixed ) + FT_Tan( FT_Angle angle ); - /*************************************************************************** - * - * @function: - * FT_Atan2 - * - * @description: - * Return the arc-tangent corresponding to a given vector (x,y) in - * the 2d plane. - * - * @input: - * x :: The horizontal vector coordinate. - * y :: The vertical vector coordinate. - * - * @return: - * The arc-tangent value (i.e. angle). - */ - FT_EXPORT( FT_Angle ) FT_Atan2( FT_Fixed x, FT_Fixed y ); + /*************************************************************************/ + /* */ + /* @function: */ + /* FT_Atan2 */ + /* */ + /* @description: */ + /* Return the arc-tangent corresponding to a given vector (x,y) in */ + /* the 2d plane. */ + /* */ + /* @input: */ + /* x :: The horizontal vector coordinate. */ + /* */ + /* y :: The vertical vector coordinate. */ + /* */ + /* @return: */ + /* The arc-tangent value (i.e. angle). */ + /* */ + FT_EXPORT( FT_Angle ) + FT_Atan2( FT_Fixed x, + FT_Fixed y ); - /*************************************************************************** - * - * @function: - * FT_Vector_Unit - * - * @description: - * Return the unit vector corresponding to a given angle. After the call, - * the value of "vec.x" will be "sin(theta)", and the value of "vec.y" - * will be "cos(angle)". - * - * This function is useful to retrieve both the sinus and cosinus of a - * given angle quickly. - * - * @input: - * vec :: The address of target vector. - * angle :: The address of angle. - */ - FT_EXPORT( void ) FT_Vector_Unit( FT_Vector* vec, - FT_Angle angle ); + /*************************************************************************/ + /* */ + /* @function: */ + /* FT_Vector_Unit */ + /* */ + /* @description: */ + /* Return the unit vector corresponding to a given angle. After the */ + /* call, the value of `vec.x' will be `sin(angle)', and the value of */ + /* `vec.y' will be `cos(angle)'. */ + /* */ + /* This function is useful to retrieve both the sinus and cosinus of */ + /* a given angle quickly. */ + /* */ + /* @output: */ + /* vec :: The address of target vector. */ + /* */ + /* @input: */ + /* angle :: The address of angle. */ + /* */ + FT_EXPORT( void ) + FT_Vector_Unit( FT_Vector* vec, + FT_Angle angle ); - /*************************************************************************** - * - * @function: - * FT_Vector_Rotate - * - * @description: - * Rotate a vector by a given angle. - * - * @input: - * vec :: The address of target vector. - * angle :: The address of angle. - */ - FT_EXPORT( void ) FT_Vector_Rotate( FT_Vector* vec, - FT_Angle angle ); + /*************************************************************************/ + /* */ + /* @function: */ + /* FT_Vector_Rotate */ + /* */ + /* @description: */ + /* Rotate a vector by a given angle. */ + /* */ + /* @inout: */ + /* vec :: The address of target vector. */ + /* */ + /* @input: */ + /* angle :: The address of angle. */ + /* */ + FT_EXPORT( void ) + FT_Vector_Rotate( FT_Vector* vec, + FT_Angle angle ); - /*************************************************************************** - * - * @function: - * FT_Vector_Length - * - * @description: - * Return the length of a given vector. - * - * @input: - * vec :: The address of target vector. - * - * @return: - * The vector length, expressed in the same units that the original - * vector coordinates. - */ - FT_EXPORT( FT_Fixed ) FT_Vector_Length( FT_Vector* vec ); + /*************************************************************************/ + /* */ + /* @function: */ + /* FT_Vector_Length */ + /* */ + /* @description: */ + /* Return the length of a given vector. */ + /* */ + /* @input: */ + /* vec :: The address of target vector. */ + /* */ + /* @return: */ + /* The vector length, expressed in the same units that the original */ + /* vector coordinates. */ + /* */ + FT_EXPORT( FT_Fixed ) + FT_Vector_Length( FT_Vector* vec ); - /*************************************************************************** - * - * @function: - * FT_Vector_Normalize - * - * @description: - * Normalize a given vector (i.e. compute the equivalent unit vector). - * - * @input: - * vec :: The address of target vector. - */ - FT_EXPORT( void ) FT_Vector_Normalize( FT_Vector* vec ); + /*************************************************************************/ + /* */ + /* @function: */ + /* FT_Vector_Normalize */ + /* */ + /* @description: */ + /* Normalize a given vector (i.e. compute the equivalent unit */ + /* vector). */ + /* */ + /* @inout: */ + /* vec :: The address of target vector. */ + /* */ + FT_EXPORT( void ) + FT_Vector_Normalize( FT_Vector* vec ); - /*************************************************************************** - * - * @function: - * FT_Vector_Polarize - * - * @description: - * Compute both the length and angle of a given vector. - * - * @input: - * vec :: The address of source vector. - * - * @output: - * length :: The vector length. - * angle :: The vector angle. - */ - FT_EXPORT( void ) FT_Vector_Polarize( FT_Vector* vec, - FT_Fixed *length, - FT_Angle *angle ); + /*************************************************************************/ + /* */ + /* @function: */ + /* FT_Vector_Polarize */ + /* */ + /* @description: */ + /* Compute both the length and angle of a given vector. */ + /* */ + /* @input: */ + /* vec :: The address of source vector. */ + /* */ + /* @output: */ + /* length :: The vector length. */ + /* angle :: The vector angle. */ + /* */ + FT_EXPORT( void ) + FT_Vector_Polarize( FT_Vector* vec, + FT_Fixed *length, + FT_Angle *angle ); /* */ diff --git a/include/freetype/tttables.h b/include/freetype/tttables.h index ebf6800ad..9a4e3126a 100644 --- a/include/freetype/tttables.h +++ b/include/freetype/tttables.h @@ -193,7 +193,7 @@ FT_BEGIN_HEADER FT_UShort number_Of_HMetrics; /* The following fields are not defined by the TrueType specification */ - /* but they're used to connect the metrics header to the relevant */ + /* but they are used to connect the metrics header to the relevant */ /* `HMTX' table. */ void* long_metrics; @@ -293,7 +293,7 @@ FT_BEGIN_HEADER /* module is able to read both the horizontal and vertical */ /* headers. */ /* */ - typedef struct TT_VertHeader_ + typedef struct TT_VertHeader_ { FT_Fixed Version; FT_Short Ascender; @@ -428,7 +428,7 @@ FT_BEGIN_HEADER /* A structure used to model a TrueType PCLT table. All fields */ /* comply to the TrueType table. */ /* */ - typedef struct TT_PCLT_ + typedef struct TT_PCLT_ { FT_Fixed Version; FT_ULong FontNumber; @@ -555,8 +555,9 @@ FT_BEGIN_HEADER /* internal use only */ - typedef void* (*FT_Get_Sfnt_Table_Func)( FT_Face face, - FT_Sfnt_Tag tag ); + typedef void* + (*FT_Get_Sfnt_Table_Func)( FT_Face face, + FT_Sfnt_Tag tag ); /*************************************************************************/ @@ -584,8 +585,9 @@ FT_BEGIN_HEADER /* by the sfnt/truetype/opentype drivers. See FT_Sfnt_Tag for a */ /* list. */ /* */ - FT_EXPORT( void* ) FT_Get_Sfnt_Table( FT_Face face, - FT_Sfnt_Tag tag ); + FT_EXPORT( void* ) + FT_Get_Sfnt_Table( FT_Face face, + FT_Sfnt_Tag tag ); /* */ diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c index 16c1ac2e3..b888523bf 100644 --- a/src/truetype/ttdriver.c +++ b/src/truetype/ttdriver.c @@ -88,11 +88,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; @@ -183,12 +183,12 @@ /* */ /* FreeType error code. 0 means success. */ /* */ - static - FT_Error Set_Char_Sizes( TT_Size size, - FT_F26Dot6 char_width, - FT_F26Dot6 char_height, - FT_UInt horz_resolution, - FT_UInt vert_resolution ) + static FT_Error + Set_Char_Sizes( TT_Size size, + FT_F26Dot6 char_width, + FT_F26Dot6 char_height, + FT_UInt horz_resolution, + FT_UInt vert_resolution ) { FT_Size_Metrics* metrics = &size->root.metrics; TT_Face face = (TT_Face)size->root.face; @@ -246,10 +246,10 @@ /* */ /* FreeType error code. 0 means success. */ /* */ - static - FT_Error Set_Pixel_Sizes( TT_Size size, - FT_UInt pixel_width, - FT_UInt pixel_height ) + static FT_Error + Set_Pixel_Sizes( TT_Size size, + FT_UInt pixel_width, + FT_UInt pixel_height ) { FT_UNUSED( pixel_width ); FT_UNUSED( pixel_height ); @@ -291,11 +291,11 @@ /* */ /* FreeType error code. 0 means success. */ /* */ - static - FT_Error Load_Glyph( TT_GlyphSlot slot, - TT_Size size, - FT_UShort glyph_index, - FT_UInt load_flags ) + static FT_Error + Load_Glyph( TT_GlyphSlot slot, + TT_Size size, + FT_UShort glyph_index, + FT_UInt load_flags ) { FT_Error error; @@ -361,9 +361,9 @@ /* */ /* Glyph index. 0 means `undefined character code'. */ /* */ - static - FT_UInt Get_Char_Index( TT_CharMap charmap, - FT_Long charcode ) + static FT_UInt + Get_Char_Index( TT_CharMap charmap, + FT_Long charcode ) { FT_Error error; TT_Face face; @@ -406,9 +406,9 @@ /*************************************************************************/ - static - FT_Module_Interface tt_get_interface( TT_Driver driver, - const char* interface ) + static FT_Module_Interface + tt_get_interface( TT_Driver driver, + const char* interface ) { FT_Module sfntd = FT_Get_Module( driver->root.root.library, "sfnt" ); @@ -499,7 +499,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 &tt_driver_class; } diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c index 522e33b3c..ada45a34d 100644 --- a/src/truetype/ttgload.c +++ b/src/truetype/ttgload.c @@ -81,11 +81,11 @@ /* This function will much probably move to another component in the */ /* near future, but I haven't decided which yet. */ /* */ - FT_LOCAL_DEF - void TT_Get_Metrics( TT_HoriHeader* header, - FT_UInt index, - FT_Short* bearing, - FT_UShort* advance ) + FT_LOCAL_DEF void + TT_Get_Metrics( TT_HoriHeader* header, + FT_UInt index, + FT_Short* bearing, + FT_UShort* advance ) { TT_LongMetrics* longs_m; FT_UShort k = header->number_Of_HMetrics; @@ -111,12 +111,12 @@ /* `check' is true, take care of monospaced fonts by returning the */ /* advance width maximum. */ /* */ - static - void Get_HMetrics( TT_Face face, - FT_UInt index, - FT_Bool check, - FT_Short* lsb, - FT_UShort* aw ) + static void + Get_HMetrics( TT_Face face, + FT_UInt index, + FT_Bool check, + FT_Short* lsb, + FT_UShort* aw ) { TT_Get_Metrics( &face->horizontal, index, lsb, aw ); @@ -130,9 +130,9 @@ /* Returns the advance width table for a given pixel size if it is */ /* found in the font's `hdmx' table (if any). */ /* */ - static - FT_Byte* Get_Advance_Widths( TT_Face face, - FT_UShort ppem ) + static FT_Byte* + Get_Advance_Widths( TT_Face face, + FT_UShort ppem ) { FT_UShort n; @@ -155,11 +155,11 @@ /* */ /* Translates an array of coordinates. */ /* */ - static - void translate_array( FT_UInt n, - FT_Vector* coords, - FT_Pos delta_x, - FT_Pos delta_y ) + static void + translate_array( FT_UInt n, + FT_Vector* coords, + FT_Pos delta_x, + FT_Pos delta_y ) { FT_UInt k; @@ -174,11 +174,11 @@ } - static - void tt_prepare_zone( TT_GlyphZone* zone, - FT_GlyphLoad* load, - FT_UInt start_point, - FT_UInt start_contour ) + static void + tt_prepare_zone( TT_GlyphZone* zone, + FT_GlyphLoad* load, + FT_UInt start_point, + FT_UInt start_contour ) { zone->n_points = (FT_UShort)( load->outline.n_points - start_point ); zone->n_contours = (FT_Short) ( load->outline.n_contours - start_contour ); @@ -201,7 +201,7 @@ /* */ /*************************************************************************/ - FT_CALLBACK_DEF(FT_Error) + FT_CALLBACK_DEF( FT_Error ) TT_Access_Glyph_Frame( TT_Loader* loader, FT_UInt glyph_index, FT_ULong offset, @@ -224,7 +224,7 @@ } - FT_CALLBACK_DEF(void) + FT_CALLBACK_DEF( void ) TT_Forget_Glyph_Frame( TT_Loader* loader ) { FT_Stream stream = loader->stream; @@ -234,7 +234,7 @@ } - FT_CALLBACK_DEF(FT_Error) + FT_CALLBACK_DEF( FT_Error ) TT_Load_Glyph_Header( TT_Loader* loader ) { FT_Stream stream = loader->stream; @@ -257,7 +257,7 @@ } - FT_CALLBACK_DEF(FT_Error) + FT_CALLBACK_DEF( FT_Error ) TT_Load_Simple_Glyph( TT_Loader* load ) { FT_Error error; @@ -416,7 +416,7 @@ } - FT_CALLBACK_DEF(FT_Error) + FT_CALLBACK_DEF( FT_Error ) TT_Load_Composite_Glyph( TT_Loader* loader ) { FT_Error error; @@ -506,8 +506,8 @@ } - FT_LOCAL_DEF - void TT_Init_Glyph_Loading( TT_Face face ) + FT_LOCAL_DEF void + TT_Init_Glyph_Loading( TT_Face face ) { face->access_glyph_frame = TT_Access_Glyph_Frame; face->read_glyph_header = TT_Load_Glyph_Header; @@ -527,9 +527,9 @@ /* Usually, this means scaling and hinting through bytecode */ /* interpretation. */ /* */ - static - FT_Error TT_Process_Simple_Glyph( TT_Loader* load, - FT_Bool debug ) + static FT_Error + TT_Process_Simple_Glyph( TT_Loader* load, + FT_Bool debug ) { FT_GlyphLoader* gloader = load->gloader; FT_Outline* outline = &gloader->current.outline; @@ -657,9 +657,9 @@ /* Loads a given truetype glyph. Handles composites and uses a */ /* TT_Loader object. */ /* */ - static - FT_Error load_truetype_glyph( TT_Loader* loader, - FT_UInt glyph_index ) + static FT_Error + load_truetype_glyph( TT_Loader* loader, + FT_UInt glyph_index ) { #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER @@ -1110,9 +1110,9 @@ } - static - void compute_glyph_metrics( TT_Loader* loader, - FT_UInt glyph_index ) + static void + compute_glyph_metrics( TT_Loader* loader, + FT_UInt glyph_index ) { FT_BBox bbox; TT_Face face = (TT_Face)loader->face; @@ -1313,11 +1313,11 @@ /* */ /* FreeType error code. 0 means success. */ /* */ - FT_LOCAL_DEF - FT_Error TT_Load_Glyph( TT_Size size, - TT_GlyphSlot glyph, - FT_UShort glyph_index, - FT_UInt load_flags ) + FT_LOCAL_DEF FT_Error + TT_Load_Glyph( TT_Size size, + TT_GlyphSlot glyph, + FT_UShort glyph_index, + FT_UInt load_flags ) { SFNT_Interface* sfnt; TT_Face face; diff --git a/src/truetype/ttgload.h b/src/truetype/ttgload.h index 1b45f51aa..f09efbf4b 100644 --- a/src/truetype/ttgload.h +++ b/src/truetype/ttgload.h @@ -31,20 +31,20 @@ FT_BEGIN_HEADER - FT_LOCAL - void TT_Get_Metrics( TT_HoriHeader* header, - FT_UInt index, - FT_Short* bearing, - FT_UShort* advance ); + FT_LOCAL void + TT_Get_Metrics( TT_HoriHeader* header, + FT_UInt index, + FT_Short* bearing, + FT_UShort* advance ); - FT_LOCAL - void TT_Init_Glyph_Loading( TT_Face face ); + FT_LOCAL void + TT_Init_Glyph_Loading( TT_Face face ); - FT_LOCAL - FT_Error TT_Load_Glyph( TT_Size size, - TT_GlyphSlot glyph, - FT_UShort glyph_index, - FT_UInt load_flags ); + FT_LOCAL FT_Error + TT_Load_Glyph( TT_Size size, + TT_GlyphSlot glyph, + FT_UShort glyph_index, + FT_UInt load_flags ); FT_END_HEADER diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index 095c387d0..0dc16401f 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -256,10 +256,10 @@ /* */ /* FreeType error code. 0 means success. */ /* */ - FT_LOCAL_DEF - FT_Error TT_Goto_CodeRange( TT_ExecContext exec, - FT_Int range, - FT_Long IP ) + FT_LOCAL_DEF FT_Error + TT_Goto_CodeRange( TT_ExecContext exec, + FT_Int range, + FT_Long IP ) { TT_CodeRange* coderange; @@ -306,11 +306,11 @@ /* */ /* FreeType error code. 0 means success. */ /* */ - FT_LOCAL_DEF - FT_Error TT_Set_CodeRange( TT_ExecContext exec, - FT_Int range, - void* base, - FT_Long length ) + FT_LOCAL_DEF FT_Error + TT_Set_CodeRange( TT_ExecContext exec, + FT_Int range, + void* base, + FT_Long length ) { FT_Assert( range >= 1 && range <= 3 ); @@ -341,9 +341,9 @@ /* */ /* Does not set the Error variable. */ /* */ - FT_LOCAL_DEF - FT_Error TT_Clear_CodeRange( TT_ExecContext exec, - FT_Int range ) + FT_LOCAL_DEF FT_Error + TT_Clear_CodeRange( TT_ExecContext exec, + FT_Int range ) { FT_Assert( range >= 1 && range <= 3 ); @@ -380,9 +380,9 @@ /* */ /* Only the glyph loader and debugger should call this function. */ /* */ - FT_LOCAL_DEF - FT_Error TT_Destroy_Context( TT_ExecContext exec, - FT_Memory memory ) + FT_LOCAL_DEF FT_Error + TT_Destroy_Context( TT_ExecContext exec, + FT_Memory memory ) { /* free composite load stack */ FREE( exec->loadStack ); @@ -432,10 +432,10 @@ /* */ /* FreeType error code. 0 means success. */ /* */ - static - FT_Error Init_Context( TT_ExecContext exec, - TT_Face face, - FT_Memory memory ) + static FT_Error + Init_Context( TT_ExecContext exec, + TT_Face face, + FT_Memory memory ) { FT_Error error; @@ -500,12 +500,12 @@ /* */ /* FreeType error code. 0 means success. */ /* */ - static - FT_Error Update_Max( FT_Memory memory, - FT_ULong* size, - FT_Long multiplier, - void** buff, - FT_ULong new_max ) + static FT_Error + Update_Max( FT_Memory memory, + FT_ULong* size, + FT_Long multiplier, + void** buff, + FT_ULong new_max ) { FT_Error error; @@ -544,10 +544,10 @@ /* */ /* Only the glyph loader and debugger should call this function. */ /* */ - FT_LOCAL_DEF - FT_Error TT_Load_Context( TT_ExecContext exec, - TT_Face face, - TT_Size size ) + FT_LOCAL_DEF FT_Error + TT_Load_Context( TT_ExecContext exec, + TT_Face face, + TT_Size size ) { FT_Int i; FT_ULong tmp; @@ -647,9 +647,9 @@ /* */ /* Only the glyph loader and debugger should call this function. */ /* */ - FT_LOCAL_DEF - FT_Error TT_Save_Context( TT_ExecContext exec, - TT_Size size ) + FT_LOCAL_DEF FT_Error + TT_Save_Context( TT_ExecContext exec, + TT_Size size ) { FT_Int i; @@ -694,9 +694,9 @@ /* */ /* Only the glyph loader and debugger should call this function. */ /* */ - FT_LOCAL_DEF - FT_Error TT_Run_Context( TT_ExecContext exec, - FT_Bool debug ) + FT_LOCAL_DEF FT_Error + TT_Run_Context( TT_ExecContext exec, + FT_Bool debug ) { FT_Error error; @@ -754,7 +754,8 @@ /* documentation is in ttinterp.h */ - FT_EXPORT_DEF( TT_ExecContext ) TT_New_Context( TT_Face face ) + FT_EXPORT_DEF( TT_ExecContext ) + TT_New_Context( TT_Face face ) { TT_Driver driver; TT_ExecContext exec; @@ -814,8 +815,8 @@ /* */ /* Only the glyph loader and debugger should call this function. */ /* */ - FT_LOCAL_DEF - FT_Error TT_Done_Context( TT_ExecContext exec ) + FT_LOCAL_DEF FT_Error + TT_Done_Context( TT_ExecContext exec ) { /* Nothing at all for now */ FT_UNUSED( exec ); @@ -827,8 +828,9 @@ /* return length of given vector */ #ifdef FT_CONFIG_OPTION_OLD_CALCS - static FT_F26Dot6 Norm( FT_F26Dot6 X, - FT_F26Dot6 Y ) + static FT_F26Dot6 + Norm( FT_F26Dot6 X, + FT_F26Dot6 Y ) { TT_INT64 T1, T2; @@ -843,8 +845,9 @@ #else /* !FT_CONFIG_OPTION_OLD_CALCS */ - static FT_F26Dot6 Norm( FT_F26Dot6 X, - FT_F26Dot6 Y ) + static FT_F26Dot6 + Norm( FT_F26Dot6 X, + FT_F26Dot6 Y ) { FT_Vector v; @@ -1210,8 +1213,8 @@ /* */ /* The aspect ratio in 16.16 format, always <= 1.0 . */ /* */ - static - FT_Long Current_Ratio( EXEC_OP ) + static FT_Long + Current_Ratio( EXEC_OP ) { if ( CUR.tt_metrics.ratio ) return CUR.tt_metrics.ratio; @@ -1235,8 +1238,8 @@ } - static - FT_Long Current_Ppem( EXEC_OP ) + static FT_Long + Current_Ppem( EXEC_OP ) { return TT_MULFIX( CUR.tt_metrics.ppem, CURRENT_Ratio() ); } @@ -1249,41 +1252,47 @@ /*************************************************************************/ - FT_CALLBACK_DEF(FT_F26Dot6) Read_CVT( EXEC_OP_ FT_ULong index ) + FT_CALLBACK_DEF( FT_F26Dot6 ) + Read_CVT( EXEC_OP_ FT_ULong index ) { return CUR.cvt[index]; } - FT_CALLBACK_DEF(FT_F26Dot6) Read_CVT_Stretched( EXEC_OP_ FT_ULong index ) + FT_CALLBACK_DEF( FT_F26Dot6 ) + Read_CVT_Stretched( EXEC_OP_ FT_ULong index ) { return TT_MULFIX( CUR.cvt[index], CURRENT_Ratio() ); } - FT_CALLBACK_DEF(void) Write_CVT( EXEC_OP_ FT_ULong index, - FT_F26Dot6 value ) + FT_CALLBACK_DEF( void ) + Write_CVT( EXEC_OP_ FT_ULong index, + FT_F26Dot6 value ) { CUR.cvt[index] = value; } - FT_CALLBACK_DEF(void) Write_CVT_Stretched( EXEC_OP_ FT_ULong index, - FT_F26Dot6 value ) + FT_CALLBACK_DEF( void ) + Write_CVT_Stretched( EXEC_OP_ FT_ULong index, + FT_F26Dot6 value ) { CUR.cvt[index] = FT_DivFix( value, CURRENT_Ratio() ); } - FT_CALLBACK_DEF(void) Move_CVT( EXEC_OP_ FT_ULong index, - FT_F26Dot6 value ) + FT_CALLBACK_DEF( void ) + Move_CVT( EXEC_OP_ FT_ULong index, + FT_F26Dot6 value ) { CUR.cvt[index] += value; } - FT_CALLBACK_DEF(void) Move_CVT_Stretched( EXEC_OP_ FT_ULong index, - FT_F26Dot6 value ) + FT_CALLBACK_DEF( void ) + Move_CVT_Stretched( EXEC_OP_ FT_ULong index, + FT_F26Dot6 value ) { CUR.cvt[index] += FT_DivFix( value, CURRENT_Ratio() ); } @@ -1304,7 +1313,8 @@ /* */ /* This one could become a macro. */ /* */ - static FT_Short GetShortIns( EXEC_OP ) + static FT_Short + GetShortIns( EXEC_OP ) { /* Reading a byte stream so there is no endianess (DaveP) */ CUR.IP += 2; @@ -1329,9 +1339,9 @@ /* */ /* SUCCESS or FAILURE. */ /* */ - static - FT_Bool Ins_Goto_CodeRange( EXEC_OP_ FT_Int aRange, - FT_ULong aIP ) + static FT_Bool + Ins_Goto_CodeRange( EXEC_OP_ FT_Int aRange, + FT_ULong aIP ) { TT_CodeRange* range; @@ -1386,10 +1396,10 @@ /* */ /* zone :: The affected glyph zone. */ /* */ - static - void Direct_Move( EXEC_OP_ TT_GlyphZone* zone, - FT_UShort point, - FT_F26Dot6 distance ) + static void + Direct_Move( EXEC_OP_ TT_GlyphZone* zone, + FT_UShort point, + FT_F26Dot6 distance ) { FT_F26Dot6 v; @@ -1448,10 +1458,10 @@ /*************************************************************************/ - static - void Direct_Move_X( EXEC_OP_ TT_GlyphZone* zone, - FT_UShort point, - FT_F26Dot6 distance ) + static void + Direct_Move_X( EXEC_OP_ TT_GlyphZone* zone, + FT_UShort point, + FT_F26Dot6 distance ) { FT_UNUSED_EXEC; @@ -1460,10 +1470,10 @@ } - static - void Direct_Move_Y( EXEC_OP_ TT_GlyphZone* zone, - FT_UShort point, - FT_F26Dot6 distance ) + static void + Direct_Move_Y( EXEC_OP_ TT_GlyphZone* zone, + FT_UShort point, + FT_F26Dot6 distance ) { FT_UNUSED_EXEC; @@ -1494,9 +1504,9 @@ /* the description of super round that we should add the compensation */ /* before rounding. */ /* */ - static - FT_F26Dot6 Round_None( EXEC_OP_ FT_F26Dot6 distance, - FT_F26Dot6 compensation ) + static FT_F26Dot6 + Round_None( EXEC_OP_ FT_F26Dot6 distance, + FT_F26Dot6 compensation ) { FT_F26Dot6 val; @@ -1534,9 +1544,9 @@ /* */ /* Rounded distance. */ /* */ - static - FT_F26Dot6 Round_To_Grid( EXEC_OP_ FT_F26Dot6 distance, - FT_F26Dot6 compensation ) + static FT_F26Dot6 + Round_To_Grid( EXEC_OP_ FT_F26Dot6 distance, + FT_F26Dot6 compensation ) { FT_F26Dot6 val; @@ -1578,9 +1588,9 @@ /* */ /* Rounded distance. */ /* */ - static - FT_F26Dot6 Round_To_Half_Grid( EXEC_OP_ FT_F26Dot6 distance, - FT_F26Dot6 compensation ) + static FT_F26Dot6 + Round_To_Half_Grid( EXEC_OP_ FT_F26Dot6 distance, + FT_F26Dot6 compensation ) { FT_F26Dot6 val; @@ -1620,9 +1630,9 @@ /* */ /* Rounded distance. */ /* */ - static - FT_F26Dot6 Round_Down_To_Grid( EXEC_OP_ FT_F26Dot6 distance, - FT_F26Dot6 compensation ) + static FT_F26Dot6 + Round_Down_To_Grid( EXEC_OP_ FT_F26Dot6 distance, + FT_F26Dot6 compensation ) { FT_F26Dot6 val; @@ -1664,9 +1674,9 @@ /* */ /* Rounded distance. */ /* */ - static - FT_F26Dot6 Round_Up_To_Grid( EXEC_OP_ FT_F26Dot6 distance, - FT_F26Dot6 compensation ) + static FT_F26Dot6 + Round_Up_To_Grid( EXEC_OP_ FT_F26Dot6 distance, + FT_F26Dot6 compensation ) { FT_F26Dot6 val; @@ -1708,9 +1718,9 @@ /* */ /* Rounded distance. */ /* */ - static - FT_F26Dot6 Round_To_Double_Grid( EXEC_OP_ FT_F26Dot6 distance, - FT_F26Dot6 compensation ) + static FT_F26Dot6 + Round_To_Double_Grid( EXEC_OP_ FT_F26Dot6 distance, + FT_F26Dot6 compensation ) { FT_F26Dot6 val; @@ -1758,9 +1768,9 @@ /* the description of super round that we should add the compensation */ /* before rounding. */ /* */ - static - FT_F26Dot6 Round_Super( EXEC_OP_ FT_F26Dot6 distance, - FT_F26Dot6 compensation ) + static FT_F26Dot6 + Round_Super( EXEC_OP_ FT_F26Dot6 distance, + FT_F26Dot6 compensation ) { FT_F26Dot6 val; @@ -1806,9 +1816,9 @@ /* There is a separate function for Round_Super_45() as we may need */ /* greater precision. */ /* */ - static - FT_F26Dot6 Round_Super_45( EXEC_OP_ FT_F26Dot6 distance, - FT_F26Dot6 compensation ) + static FT_F26Dot6 + Round_Super_45( EXEC_OP_ FT_F26Dot6 distance, + FT_F26Dot6 compensation ) { FT_F26Dot6 val; @@ -1845,8 +1855,8 @@ /* */ /* round_mode :: The rounding mode to be used. */ /* */ - static - void Compute_Round( EXEC_OP_ FT_Byte round_mode ) + static void + Compute_Round( EXEC_OP_ FT_Byte round_mode ) { switch ( round_mode ) { @@ -1897,9 +1907,9 @@ /* GridPeriod :: Grid period */ /* selector :: SROUND opcode */ /* */ - static - void SetSuperRound( EXEC_OP_ FT_F26Dot6 GridPeriod, - FT_Long selector ) + static void + SetSuperRound( EXEC_OP_ FT_F26Dot6 GridPeriod, + FT_Long selector ) { switch ( (FT_Int)( selector & 0xC0 ) ) { @@ -1968,9 +1978,9 @@ /* */ /* The distance in F26dot6 format. */ /* */ - static - FT_F26Dot6 Project( EXEC_OP_ FT_Vector* v1, - FT_Vector* v2 ) + static FT_F26Dot6 + Project( EXEC_OP_ FT_Vector* v1, + FT_Vector* v2 ) { return TT_MULDIV( v1->x - v2->x, CUR.GS.projVector.x, 0x4000 ) + TT_MULDIV( v1->y - v2->y, CUR.GS.projVector.y, 0x4000 ); @@ -1993,9 +2003,9 @@ /* */ /* The distance in F26dot6 format. */ /* */ - static - FT_F26Dot6 Dual_Project( EXEC_OP_ FT_Vector* v1, - FT_Vector* v2 ) + static FT_F26Dot6 + Dual_Project( EXEC_OP_ FT_Vector* v1, + FT_Vector* v2 ) { return TT_MULDIV( v1->x - v2->x, CUR.GS.dualVector.x, 0x4000 ) + TT_MULDIV( v1->y - v2->y, CUR.GS.dualVector.y, 0x4000 ); @@ -2018,9 +2028,9 @@ /* */ /* The distance in F26dot6 format. */ /* */ - static - FT_F26Dot6 Free_Project( EXEC_OP_ FT_Vector* v1, - FT_Vector* v2 ) + static FT_F26Dot6 + Free_Project( EXEC_OP_ FT_Vector* v1, + FT_Vector* v2 ) { return TT_MULDIV( v1->x - v2->x, CUR.GS.freeVector.x, 0x4000 ) + TT_MULDIV( v1->y - v2->y, CUR.GS.freeVector.y, 0x4000 ); @@ -2043,9 +2053,9 @@ /* */ /* The distance in F26dot6 format. */ /* */ - static - FT_F26Dot6 Project_x( EXEC_OP_ FT_Vector* v1, - FT_Vector* v2 ) + static FT_F26Dot6 + Project_x( EXEC_OP_ FT_Vector* v1, + FT_Vector* v2 ) { FT_UNUSED_EXEC; @@ -2069,9 +2079,9 @@ /* */ /* The distance in F26dot6 format. */ /* */ - static - FT_F26Dot6 Project_y( EXEC_OP_ FT_Vector* v1, - FT_Vector* v2 ) + static FT_F26Dot6 + Project_y( EXEC_OP_ FT_Vector* v1, + FT_Vector* v2 ) { FT_UNUSED_EXEC; @@ -2088,8 +2098,8 @@ /* Computes the projection and movement function pointers according */ /* to the current graphics state. */ /* */ - static - void Compute_Funcs( EXEC_OP ) + static void + Compute_Funcs( EXEC_OP ) { if ( CUR.GS.freeVector.x == 0x4000 ) { @@ -2180,10 +2190,10 @@ #ifdef FT_CONFIG_OPTION_OLD_CALCS - static - FT_Bool Normalize( EXEC_OP_ FT_F26Dot6 Vx, - FT_F26Dot6 Vy, - FT_UnitVector* R ) + static FT_Bool + Normalize( EXEC_OP_ FT_F26Dot6 Vx, + FT_F26Dot6 Vy, + FT_UnitVector* R ) { FT_F26Dot6 W; FT_Bool S1, S2; @@ -2276,10 +2286,10 @@ #else - static - FT_Bool Normalize( EXEC_OP_ FT_F26Dot6 Vx, - FT_F26Dot6 Vy, - FT_UnitVector* R ) + static FT_Bool + Normalize( EXEC_OP_ FT_F26Dot6 Vx, + FT_F26Dot6 Vy, + FT_UnitVector* R ) { FT_Vector v; FT_Angle angle; @@ -2304,11 +2314,11 @@ /*************************************************************************/ - static - FT_Bool Ins_SxVTL( EXEC_OP_ FT_UShort aIdx1, - FT_UShort aIdx2, - FT_Int aOpc, - FT_UnitVector* Vec ) + static FT_Bool + Ins_SxVTL( EXEC_OP_ FT_UShort aIdx1, + FT_UShort aIdx2, + FT_Int aOpc, + FT_UnitVector* Vec ) { FT_Long A, B, C; FT_Vector* p1; @@ -2860,8 +2870,8 @@ /* Opcode range: 0x00-0x01 */ /* Stack: --> */ /* */ - static - void Ins_SVTCA( INS_ARG ) + static void + Ins_SVTCA( INS_ARG ) { DO_SVTCA } @@ -2873,8 +2883,8 @@ /* Opcode range: 0x02-0x03 */ /* Stack: --> */ /* */ - static - void Ins_SPVTCA( INS_ARG ) + static void + Ins_SPVTCA( INS_ARG ) { DO_SPVTCA } @@ -2886,8 +2896,8 @@ /* Opcode range: 0x04-0x05 */ /* Stack: --> */ /* */ - static - void Ins_SFVTCA( INS_ARG ) + static void + Ins_SFVTCA( INS_ARG ) { DO_SFVTCA } @@ -2899,8 +2909,8 @@ /* Opcode range: 0x06-0x07 */ /* Stack: uint32 uint32 --> */ /* */ - static - void Ins_SPVTL( INS_ARG ) + static void + Ins_SPVTL( INS_ARG ) { DO_SPVTL } @@ -2912,8 +2922,8 @@ /* Opcode range: 0x08-0x09 */ /* Stack: uint32 uint32 --> */ /* */ - static - void Ins_SFVTL( INS_ARG ) + static void + Ins_SFVTL( INS_ARG ) { DO_SFVTL } @@ -2925,8 +2935,8 @@ /* Opcode range: 0x0E */ /* Stack: --> */ /* */ - static - void Ins_SFVTPV( INS_ARG ) + static void + Ins_SFVTPV( INS_ARG ) { DO_SFVTPV } @@ -2938,8 +2948,8 @@ /* Opcode range: 0x0A */ /* Stack: f2.14 f2.14 --> */ /* */ - static - void Ins_SPVFS( INS_ARG ) + static void + Ins_SPVFS( INS_ARG ) { DO_SPVFS } @@ -2951,8 +2961,8 @@ /* Opcode range: 0x0B */ /* Stack: f2.14 f2.14 --> */ /* */ - static - void Ins_SFVFS( INS_ARG ) + static void + Ins_SFVFS( INS_ARG ) { DO_SFVFS } @@ -2964,8 +2974,8 @@ /* Opcode range: 0x0C */ /* Stack: ef2.14 --> ef2.14 */ /* */ - static - void Ins_GPV( INS_ARG ) + static void + Ins_GPV( INS_ARG ) { DO_GPV } @@ -2976,8 +2986,8 @@ /* Opcode range: 0x0D */ /* Stack: ef2.14 --> ef2.14 */ /* */ - static - void Ins_GFV( INS_ARG ) + static void + Ins_GFV( INS_ARG ) { DO_GFV } @@ -2989,8 +2999,8 @@ /* Opcode range: 0x10 */ /* Stack: uint32 --> */ /* */ - static - void Ins_SRP0( INS_ARG ) + static void + Ins_SRP0( INS_ARG ) { DO_SRP0 } @@ -3002,8 +3012,8 @@ /* Opcode range: 0x11 */ /* Stack: uint32 --> */ /* */ - static - void Ins_SRP1( INS_ARG ) + static void + Ins_SRP1( INS_ARG ) { DO_SRP1 } @@ -3015,8 +3025,8 @@ /* Opcode range: 0x12 */ /* Stack: uint32 --> */ /* */ - static - void Ins_SRP2( INS_ARG ) + static void + Ins_SRP2( INS_ARG ) { DO_SRP2 } @@ -3028,8 +3038,8 @@ /* Opcode range: 0x19 */ /* Stack: --> */ /* */ - static - void Ins_RTHG( INS_ARG ) + static void + Ins_RTHG( INS_ARG ) { DO_RTHG } @@ -3041,8 +3051,8 @@ /* Opcode range: 0x18 */ /* Stack: --> */ /* */ - static - void Ins_RTG( INS_ARG ) + static void + Ins_RTG( INS_ARG ) { DO_RTG } @@ -3053,8 +3063,8 @@ /* Opcode range: 0x3D */ /* Stack: --> */ /* */ - static - void Ins_RTDG( INS_ARG ) + static void + Ins_RTDG( INS_ARG ) { DO_RTDG } @@ -3065,8 +3075,8 @@ /* Opcode range: 0x7C */ /* Stack: --> */ /* */ - static - void Ins_RUTG( INS_ARG ) + static void + Ins_RUTG( INS_ARG ) { DO_RUTG } @@ -3078,8 +3088,8 @@ /* Opcode range: 0x7D */ /* Stack: --> */ /* */ - static - void Ins_RDTG( INS_ARG ) + static void + Ins_RDTG( INS_ARG ) { DO_RDTG } @@ -3091,8 +3101,8 @@ /* Opcode range: 0x7A */ /* Stack: --> */ /* */ - static - void Ins_ROFF( INS_ARG ) + static void + Ins_ROFF( INS_ARG ) { DO_ROFF } @@ -3104,8 +3114,8 @@ /* Opcode range: 0x76 */ /* Stack: Eint8 --> */ /* */ - static - void Ins_SROUND( INS_ARG ) + static void + Ins_SROUND( INS_ARG ) { DO_SROUND } @@ -3117,8 +3127,8 @@ /* Opcode range: 0x77 */ /* Stack: uint32 --> */ /* */ - static - void Ins_S45ROUND( INS_ARG ) + static void + Ins_S45ROUND( INS_ARG ) { DO_S45ROUND } @@ -3130,8 +3140,8 @@ /* Opcode range: 0x17 */ /* Stack: int32? --> */ /* */ - static - void Ins_SLOOP( INS_ARG ) + static void + Ins_SLOOP( INS_ARG ) { DO_SLOOP } @@ -3143,8 +3153,8 @@ /* Opcode range: 0x1A */ /* Stack: f26.6 --> */ /* */ - static - void Ins_SMD( INS_ARG ) + static void + Ins_SMD( INS_ARG ) { DO_SMD } @@ -3156,8 +3166,8 @@ /* Opcode range: 0x1D */ /* Stack: f26.6 --> */ /* */ - static - void Ins_SCVTCI( INS_ARG ) + static void + Ins_SCVTCI( INS_ARG ) { DO_SCVTCI } @@ -3169,8 +3179,8 @@ /* Opcode range: 0x1E */ /* Stack: f26.6 --> */ /* */ - static - void Ins_SSWCI( INS_ARG ) + static void + Ins_SSWCI( INS_ARG ) { DO_SSWCI } @@ -3182,8 +3192,8 @@ /* Opcode range: 0x1F */ /* Stack: int32? --> */ /* */ - static - void Ins_SSW( INS_ARG ) + static void + Ins_SSW( INS_ARG ) { DO_SSW } @@ -3195,8 +3205,8 @@ /* Opcode range: 0x4D */ /* Stack: --> */ /* */ - static - void Ins_FLIPON( INS_ARG ) + static void + Ins_FLIPON( INS_ARG ) { DO_FLIPON } @@ -3208,8 +3218,8 @@ /* Opcode range: 0x4E */ /* Stack: --> */ /* */ - static - void Ins_FLIPOFF( INS_ARG ) + static void + Ins_FLIPOFF( INS_ARG ) { DO_FLIPOFF } @@ -3221,8 +3231,8 @@ /* Opcode range: 0x7E */ /* Stack: uint32 --> */ /* */ - static - void Ins_SANGW( INS_ARG ) + static void + Ins_SANGW( INS_ARG ) { /* instruction not supported anymore */ } @@ -3234,8 +3244,8 @@ /* Opcode range: 0x5E */ /* Stack: uint32 --> */ /* */ - static - void Ins_SDB( INS_ARG ) + static void + Ins_SDB( INS_ARG ) { DO_SDB } @@ -3247,8 +3257,8 @@ /* Opcode range: 0x5F */ /* Stack: uint32 --> */ /* */ - static - void Ins_SDS( INS_ARG ) + static void + Ins_SDS( INS_ARG ) { DO_SDS } @@ -3260,8 +3270,8 @@ /* Opcode range: 0x4B */ /* Stack: --> Euint16 */ /* */ - static - void Ins_MPPEM( INS_ARG ) + static void + Ins_MPPEM( INS_ARG ) { DO_MPPEM } @@ -3273,8 +3283,8 @@ /* Opcode range: 0x4C */ /* Stack: --> Euint16 */ /* */ - static - void Ins_MPS( INS_ARG ) + static void + Ins_MPS( INS_ARG ) { DO_MPS } @@ -3286,8 +3296,8 @@ /* Opcode range: 0x20 */ /* Stack: StkElt --> StkElt StkElt */ /* */ - static - void Ins_DUP( INS_ARG ) + static void + Ins_DUP( INS_ARG ) { DO_DUP } @@ -3299,8 +3309,8 @@ /* Opcode range: 0x21 */ /* Stack: StkElt --> */ /* */ - static - void Ins_POP( INS_ARG ) + static void + Ins_POP( INS_ARG ) { /* nothing to do */ } @@ -3312,8 +3322,8 @@ /* Opcode range: 0x22 */ /* Stack: StkElt... --> */ /* */ - static - void Ins_CLEAR( INS_ARG ) + static void + Ins_CLEAR( INS_ARG ) { DO_CLEAR } @@ -3325,8 +3335,8 @@ /* Opcode range: 0x23 */ /* Stack: 2 * StkElt --> 2 * StkElt */ /* */ - static - void Ins_SWAP( INS_ARG ) + static void + Ins_SWAP( INS_ARG ) { DO_SWAP } @@ -3338,8 +3348,8 @@ /* Opcode range: 0x24 */ /* Stack: --> uint32 */ /* */ - static - void Ins_DEPTH( INS_ARG ) + static void + Ins_DEPTH( INS_ARG ) { DO_DEPTH } @@ -3351,8 +3361,8 @@ /* Opcode range: 0x25 */ /* Stack: int32 --> StkElt */ /* */ - static - void Ins_CINDEX( INS_ARG ) + static void + Ins_CINDEX( INS_ARG ) { DO_CINDEX } @@ -3364,8 +3374,8 @@ /* Opcode range: 0x59 */ /* Stack: --> */ /* */ - static - void Ins_EIF( INS_ARG ) + static void + Ins_EIF( INS_ARG ) { /* nothing to do */ } @@ -3377,8 +3387,8 @@ /* Opcode range: 0x78 */ /* Stack: StkElt int32 --> */ /* */ - static - void Ins_JROT( INS_ARG ) + static void + Ins_JROT( INS_ARG ) { DO_JROT } @@ -3390,8 +3400,8 @@ /* Opcode range: 0x1C */ /* Stack: int32 --> */ /* */ - static - void Ins_JMPR( INS_ARG ) + static void + Ins_JMPR( INS_ARG ) { DO_JMPR } @@ -3403,8 +3413,8 @@ /* Opcode range: 0x79 */ /* Stack: StkElt int32 --> */ /* */ - static - void Ins_JROF( INS_ARG ) + static void + Ins_JROF( INS_ARG ) { DO_JROF } @@ -3416,8 +3426,8 @@ /* Opcode range: 0x50 */ /* Stack: int32? int32? --> bool */ /* */ - static - void Ins_LT( INS_ARG ) + static void + Ins_LT( INS_ARG ) { DO_LT } @@ -3429,8 +3439,8 @@ /* Opcode range: 0x51 */ /* Stack: int32? int32? --> bool */ /* */ - static - void Ins_LTEQ( INS_ARG ) + static void + Ins_LTEQ( INS_ARG ) { DO_LTEQ } @@ -3442,8 +3452,8 @@ /* Opcode range: 0x52 */ /* Stack: int32? int32? --> bool */ /* */ - static - void Ins_GT( INS_ARG ) + static void + Ins_GT( INS_ARG ) { DO_GT } @@ -3455,8 +3465,8 @@ /* Opcode range: 0x53 */ /* Stack: int32? int32? --> bool */ /* */ - static - void Ins_GTEQ( INS_ARG ) + static void + Ins_GTEQ( INS_ARG ) { DO_GTEQ } @@ -3468,8 +3478,8 @@ /* Opcode range: 0x54 */ /* Stack: StkElt StkElt --> bool */ /* */ - static - void Ins_EQ( INS_ARG ) + static void + Ins_EQ( INS_ARG ) { DO_EQ } @@ -3481,8 +3491,8 @@ /* Opcode range: 0x55 */ /* Stack: StkElt StkElt --> bool */ /* */ - static - void Ins_NEQ( INS_ARG ) + static void + Ins_NEQ( INS_ARG ) { DO_NEQ } @@ -3494,8 +3504,8 @@ /* Opcode range: 0x56 */ /* Stack: f26.6 --> bool */ /* */ - static - void Ins_ODD( INS_ARG ) + static void + Ins_ODD( INS_ARG ) { DO_ODD } @@ -3507,8 +3517,8 @@ /* Opcode range: 0x57 */ /* Stack: f26.6 --> bool */ /* */ - static - void Ins_EVEN( INS_ARG ) + static void + Ins_EVEN( INS_ARG ) { DO_EVEN } @@ -3520,8 +3530,8 @@ /* Opcode range: 0x5A */ /* Stack: uint32 uint32 --> uint32 */ /* */ - static - void Ins_AND( INS_ARG ) + static void + Ins_AND( INS_ARG ) { DO_AND } @@ -3533,8 +3543,8 @@ /* Opcode range: 0x5B */ /* Stack: uint32 uint32 --> uint32 */ /* */ - static - void Ins_OR( INS_ARG ) + static void + Ins_OR( INS_ARG ) { DO_OR } @@ -3546,8 +3556,8 @@ /* Opcode range: 0x5C */ /* Stack: StkElt --> uint32 */ /* */ - static - void Ins_NOT( INS_ARG ) + static void + Ins_NOT( INS_ARG ) { DO_NOT } @@ -3559,8 +3569,8 @@ /* Opcode range: 0x60 */ /* Stack: f26.6 f26.6 --> f26.6 */ /* */ - static - void Ins_ADD( INS_ARG ) + static void + Ins_ADD( INS_ARG ) { DO_ADD } @@ -3572,8 +3582,8 @@ /* Opcode range: 0x61 */ /* Stack: f26.6 f26.6 --> f26.6 */ /* */ - static - void Ins_SUB( INS_ARG ) + static void + Ins_SUB( INS_ARG ) { DO_SUB } @@ -3585,8 +3595,8 @@ /* Opcode range: 0x62 */ /* Stack: f26.6 f26.6 --> f26.6 */ /* */ - static - void Ins_DIV( INS_ARG ) + static void + Ins_DIV( INS_ARG ) { DO_DIV } @@ -3598,8 +3608,8 @@ /* Opcode range: 0x63 */ /* Stack: f26.6 f26.6 --> f26.6 */ /* */ - static - void Ins_MUL( INS_ARG ) + static void + Ins_MUL( INS_ARG ) { DO_MUL } @@ -3611,8 +3621,8 @@ /* Opcode range: 0x64 */ /* Stack: f26.6 --> f26.6 */ /* */ - static - void Ins_ABS( INS_ARG ) + static void + Ins_ABS( INS_ARG ) { DO_ABS } @@ -3624,8 +3634,8 @@ /* Opcode range: 0x65 */ /* Stack: f26.6 --> f26.6 */ /* */ - static - void Ins_NEG( INS_ARG ) + static void + Ins_NEG( INS_ARG ) { DO_NEG } @@ -3637,8 +3647,8 @@ /* Opcode range: 0x66 */ /* Stack: f26.6 --> f26.6 */ /* */ - static - void Ins_FLOOR( INS_ARG ) + static void + Ins_FLOOR( INS_ARG ) { DO_FLOOR } @@ -3650,8 +3660,8 @@ /* Opcode range: 0x67 */ /* Stack: f26.6 --> f26.6 */ /* */ - static - void Ins_CEILING( INS_ARG ) + static void + Ins_CEILING( INS_ARG ) { DO_CEILING } @@ -3663,8 +3673,8 @@ /* Opcode range: 0x43 */ /* Stack: uint32 --> uint32 */ /* */ - static - void Ins_RS( INS_ARG ) + static void + Ins_RS( INS_ARG ) { DO_RS } @@ -3676,8 +3686,8 @@ /* Opcode range: 0x42 */ /* Stack: uint32 uint32 --> */ /* */ - static - void Ins_WS( INS_ARG ) + static void + Ins_WS( INS_ARG ) { DO_WS } @@ -3689,8 +3699,8 @@ /* Opcode range: 0x44 */ /* Stack: f26.6 uint32 --> */ /* */ - static - void Ins_WCVTP( INS_ARG ) + static void + Ins_WCVTP( INS_ARG ) { DO_WCVTP } @@ -3702,8 +3712,8 @@ /* Opcode range: 0x70 */ /* Stack: uint32 uint32 --> */ /* */ - static - void Ins_WCVTF( INS_ARG ) + static void + Ins_WCVTF( INS_ARG ) { DO_WCVTF } @@ -3715,8 +3725,8 @@ /* Opcode range: 0x45 */ /* Stack: uint32 --> f26.6 */ /* */ - static - void Ins_RCVT( INS_ARG ) + static void + Ins_RCVT( INS_ARG ) { DO_RCVT } @@ -3728,8 +3738,8 @@ /* Opcode range: 0x7F */ /* Stack: uint32 --> */ /* */ - static - void Ins_AA( INS_ARG ) + static void + Ins_AA( INS_ARG ) { /* intentionally no longer supported */ } @@ -3743,8 +3753,8 @@ /* */ /* Note: The original instruction pops a value from the stack. */ /* */ - static - void Ins_DEBUG( INS_ARG ) + static void + Ins_DEBUG( INS_ARG ) { DO_DEBUG } @@ -3756,8 +3766,8 @@ /* Opcode range: 0x68-0x6B */ /* Stack: f26.6 --> f26.6 */ /* */ - static - void Ins_ROUND( INS_ARG ) + static void + Ins_ROUND( INS_ARG ) { DO_ROUND } @@ -3769,8 +3779,8 @@ /* Opcode range: 0x6C-0x6F */ /* Stack: f26.6 --> f26.6 */ /* */ - static - void Ins_NROUND( INS_ARG ) + static void + Ins_NROUND( INS_ARG ) { DO_NROUND } @@ -3782,8 +3792,8 @@ /* Opcode range: 0x68 */ /* Stack: int32? int32? --> int32 */ /* */ - static - void Ins_MAX( INS_ARG ) + static void + Ins_MAX( INS_ARG ) { DO_MAX } @@ -3795,8 +3805,8 @@ /* Opcode range: 0x69 */ /* Stack: int32? int32? --> int32 */ /* */ - static - void Ins_MIN( INS_ARG ) + static void + Ins_MIN( INS_ARG ) { DO_MIN } @@ -3818,8 +3828,8 @@ /* Opcode range: 0x26 */ /* Stack: int32? --> StkElt */ /* */ - static - void Ins_MINDEX( INS_ARG ) + static void + Ins_MINDEX( INS_ARG ) { FT_Long L, K; @@ -3848,8 +3858,8 @@ /* Opcode range: 0x8A */ /* Stack: 3 * StkElt --> 3 * StkElt */ /* */ - static - void Ins_ROLL( INS_ARG ) + static void + Ins_ROLL( INS_ARG ) { FT_Long A, B, C; @@ -3875,8 +3885,8 @@ /*************************************************************************/ - static - FT_Bool SkipCode( EXEC_OP ) + static FT_Bool + SkipCode( EXEC_OP ) { CUR.IP += CUR.length; @@ -3908,8 +3918,8 @@ /* Opcode range: 0x58 */ /* Stack: StkElt --> */ /* */ - static - void Ins_IF( INS_ARG ) + static void + Ins_IF( INS_ARG ) { FT_Int nIfs; FT_Bool Out; @@ -3951,8 +3961,8 @@ /* Opcode range: 0x1B */ /* Stack: --> */ /* */ - static - void Ins_ELSE( INS_ARG ) + static void + Ins_ELSE( INS_ARG ) { FT_Int nIfs; @@ -3995,8 +4005,8 @@ /* Opcode range: 0x2C */ /* Stack: uint32 --> */ /* */ - static - void Ins_FDEF( INS_ARG ) + static void + Ins_FDEF( INS_ARG ) { FT_ULong n; TT_DefRecord* rec; @@ -4060,8 +4070,8 @@ /* Opcode range: 0x2D */ /* Stack: --> */ /* */ - static - void Ins_ENDF( INS_ARG ) + static void + Ins_ENDF( INS_ARG ) { TT_CallRec* pRec; @@ -4108,8 +4118,8 @@ /* Opcode range: 0x2B */ /* Stack: uint32? --> */ /* */ - static - void Ins_CALL( INS_ARG ) + static void + Ins_CALL( INS_ARG ) { FT_ULong F; TT_CallRec* pCrec; @@ -4185,8 +4195,8 @@ /* Opcode range: 0x2A */ /* Stack: uint32? Eint16? --> */ /* */ - static - void Ins_LOOPCALL( INS_ARG ) + static void + Ins_LOOPCALL( INS_ARG ) { FT_ULong F; TT_CallRec* pCrec; @@ -4263,8 +4273,8 @@ /* Opcode range: 0x89 */ /* Stack: Eint8 --> */ /* */ - static - void Ins_IDEF( INS_ARG ) + static void + Ins_IDEF( INS_ARG ) { TT_DefRecord* def; TT_DefRecord* limit; @@ -4331,8 +4341,8 @@ /* Opcode range: 0x40 */ /* Stack: --> uint32... */ /* */ - static - void Ins_NPUSHB( INS_ARG ) + static void + Ins_NPUSHB( INS_ARG ) { FT_UShort L, K; @@ -4358,8 +4368,8 @@ /* Opcode range: 0x41 */ /* Stack: --> int32... */ /* */ - static - void Ins_NPUSHW( INS_ARG ) + static void + Ins_NPUSHW( INS_ARG ) { FT_UShort L, K; @@ -4388,8 +4398,8 @@ /* Opcode range: 0xB0-0xB7 */ /* Stack: --> uint32... */ /* */ - static - void Ins_PUSHB( INS_ARG ) + static void + Ins_PUSHB( INS_ARG ) { FT_UShort L, K; @@ -4413,8 +4423,8 @@ /* Opcode range: 0xB8-0xBF */ /* Stack: --> int32... */ /* */ - static - void Ins_PUSHW( INS_ARG ) + static void + Ins_PUSHW( INS_ARG ) { FT_UShort L, K; @@ -4454,7 +4464,8 @@ /* BULLSHIT: Measures from the original glyph must be taken along the */ /* dual projection vector! */ /* */ - static void Ins_GC( INS_ARG ) + static void + Ins_GC( INS_ARG ) { FT_ULong L; FT_F26Dot6 R; @@ -4494,8 +4505,8 @@ /* */ /* OA := OA + ( value - OA.p )/( f.p ) * f */ /* */ - static - void Ins_SCFS( INS_ARG ) + static void + Ins_SCFS( INS_ARG ) { FT_Long K; FT_UShort L; @@ -4536,8 +4547,8 @@ /* */ /* Third one: `zp0 - zp1', and not `zp2 - zp1! */ /* */ - static - void Ins_MD( INS_ARG ) + static void + Ins_MD( INS_ARG ) { FT_UShort K, L; FT_F26Dot6 D; @@ -4574,8 +4585,8 @@ /* Opcode range: 0x86-0x87 */ /* Stack: uint32 uint32 --> */ /* */ - static - void Ins_SDPVTL( INS_ARG ) + static void + Ins_SDPVTL( INS_ARG ) { FT_Long A, B, C; FT_UShort p1, p2; /* was FT_Int in pas type ERROR */ @@ -4638,8 +4649,8 @@ /* Opcode range: 0x13 */ /* Stack: uint32 --> */ /* */ - static - void Ins_SZP0( INS_ARG ) + static void + Ins_SZP0( INS_ARG ) { switch ( (FT_Int)args[0] ) { @@ -4667,8 +4678,8 @@ /* Opcode range: 0x14 */ /* Stack: uint32 --> */ /* */ - static - void Ins_SZP1( INS_ARG ) + static void + Ins_SZP1( INS_ARG ) { switch ( (FT_Int)args[0] ) { @@ -4696,8 +4707,8 @@ /* Opcode range: 0x15 */ /* Stack: uint32 --> */ /* */ - static - void Ins_SZP2( INS_ARG ) + static void + Ins_SZP2( INS_ARG ) { switch ( (FT_Int)args[0] ) { @@ -4725,8 +4736,8 @@ /* Opcode range: 0x16 */ /* Stack: uint32 --> */ /* */ - static - void Ins_SZPS( INS_ARG ) + static void + Ins_SZPS( INS_ARG ) { switch ( (FT_Int)args[0] ) { @@ -4759,8 +4770,8 @@ /* Opcode range: 0x8e */ /* Stack: int32 int32 --> */ /* */ - static - void Ins_INSTCTRL( INS_ARG ) + static void + Ins_INSTCTRL( INS_ARG ) { FT_Long K, L; @@ -4789,8 +4800,8 @@ /* Opcode range: 0x85 */ /* Stack: uint32? --> */ /* */ - static - void Ins_SCANCTRL( INS_ARG ) + static void + Ins_SCANCTRL( INS_ARG ) { FT_Int A; @@ -4832,7 +4843,7 @@ if ( (args[0] & 0x2000) != 0 && CUR.tt_metrics.stretched ) CUR.GS.scan_control = FALSE; -} + } /*************************************************************************/ @@ -4841,8 +4852,8 @@ /* Opcode range: 0x8D */ /* Stack: uint32? --> */ /* */ - static - void Ins_SCANTYPE( INS_ARG ) + static void + Ins_SCANTYPE( INS_ARG ) { /* for compatibility with future enhancements, */ /* we must ignore new modes */ @@ -4872,8 +4883,8 @@ /* Opcode range: 0x80 */ /* Stack: uint32... --> */ /* */ - static - void Ins_FLIPPT( INS_ARG ) + static void + Ins_FLIPPT( INS_ARG ) { FT_UShort point; @@ -4917,8 +4928,8 @@ /* Opcode range: 0x81 */ /* Stack: uint32 uint32 --> */ /* */ - static - void Ins_FLIPRGON( INS_ARG ) + static void + Ins_FLIPRGON( INS_ARG ) { FT_UShort I, K, L; @@ -4945,8 +4956,8 @@ /* Opcode range: 0x82 */ /* Stack: uint32 uint32 --> */ /* */ - static - void Ins_FLIPRGOFF( INS_ARG ) + static void + Ins_FLIPRGOFF( INS_ARG ) { FT_UShort I, K, L; @@ -4967,11 +4978,11 @@ } - static - FT_Bool Compute_Point_Displacement( EXEC_OP_ FT_F26Dot6* x, - FT_F26Dot6* y, - TT_GlyphZone* zone, - FT_UShort* refp ) + static FT_Bool + Compute_Point_Displacement( EXEC_OP_ FT_F26Dot6* x, + FT_F26Dot6* y, + TT_GlyphZone* zone, + FT_UShort* refp ) { TT_GlyphZone zp; FT_UShort p; @@ -5021,11 +5032,11 @@ } - static - void Move_Zp2_Point( EXEC_OP_ FT_UShort point, - FT_F26Dot6 dx, - FT_F26Dot6 dy, - FT_Bool touch ) + static void + Move_Zp2_Point( EXEC_OP_ FT_UShort point, + FT_F26Dot6 dx, + FT_F26Dot6 dy, + FT_Bool touch ) { if ( CUR.GS.freeVector.x != 0 ) { @@ -5049,8 +5060,8 @@ /* Opcode range: 0x32-0x33 */ /* Stack: uint32... --> */ /* */ - static - void Ins_SHP( INS_ARG ) + static void + Ins_SHP( INS_ARG ) { TT_GlyphZone zp; FT_UShort refp; @@ -5102,8 +5113,8 @@ /* Opcode range: 0x34-35 */ /* Stack: uint32 --> */ /* */ - static - void Ins_SHC( INS_ARG ) + static void + Ins_SHC( INS_ARG ) { TT_GlyphZone zp; FT_UShort refp; @@ -5158,8 +5169,8 @@ /* Opcode range: 0x36-37 */ /* Stack: uint32 --> */ /* */ - static - void Ins_SHZ( INS_ARG ) + static void + Ins_SHZ( INS_ARG ) { TT_GlyphZone zp; FT_UShort refp; @@ -5199,8 +5210,8 @@ /* Opcode range: 0x38 */ /* Stack: f26.6 uint32... --> */ /* */ - static - void Ins_SHPIX( INS_ARG ) + static void + Ins_SHPIX( INS_ARG ) { FT_F26Dot6 dx, dy; FT_UShort point; @@ -5250,8 +5261,8 @@ /* Opcode range: 0x3A-0x3B */ /* Stack: f26.6 uint32 --> */ /* */ - static - void Ins_MSIRP( INS_ARG ) + static void + Ins_MSIRP( INS_ARG ) { FT_UShort point; FT_F26Dot6 distance; @@ -5293,8 +5304,8 @@ /* Opcode range: 0x2E-0x2F */ /* Stack: uint32 --> */ /* */ - static - void Ins_MDAP( INS_ARG ) + static void + Ins_MDAP( INS_ARG ) { FT_UShort point; FT_F26Dot6 cur_dist, @@ -5334,8 +5345,8 @@ /* Opcode range: 0x3E-0x3F */ /* Stack: uint32 uint32 --> */ /* */ - static - void Ins_MIAP( INS_ARG ) + static void + Ins_MIAP( INS_ARG ) { FT_ULong cvtEntry; FT_UShort point; @@ -5410,8 +5421,8 @@ /* Opcode range: 0xC0-0xDF */ /* Stack: uint32 --> */ /* */ - static - void Ins_MDRP( INS_ARG ) + static void + Ins_MDRP( INS_ARG ) { FT_UShort point; FT_F26Dot6 org_dist, distance; @@ -5491,8 +5502,8 @@ /* Opcode range: 0xE0-0xFF */ /* Stack: int32? uint32 --> */ /* */ - static - void Ins_MIRP( INS_ARG ) + static void + Ins_MIRP( INS_ARG ) { FT_UShort point; FT_ULong cvtEntry; @@ -5618,8 +5629,8 @@ /* Opcode range: 0x3C */ /* Stack: uint32 uint32... --> */ /* */ - static - void Ins_ALIGNRP( INS_ARG ) + static void + Ins_ALIGNRP( INS_ARG ) { FT_UShort point; FT_F26Dot6 distance; @@ -5671,8 +5682,8 @@ /* Opcode range: 0x0F */ /* Stack: 5 * uint32 --> */ /* */ - static - void Ins_ISECT( INS_ARG ) + static void + Ins_ISECT( INS_ARG ) { FT_UShort point, a0, a1, @@ -5753,8 +5764,8 @@ /* Opcode range: 0x27 */ /* Stack: uint32 uint32 --> */ /* */ - static - void Ins_ALIGNPTS( INS_ARG ) + static void + Ins_ALIGNPTS( INS_ARG ) { FT_UShort p1, p2; FT_F26Dot6 distance; @@ -5785,8 +5796,8 @@ /* Opcode range: 0x39 */ /* Stack: uint32... --> */ /* */ - static - void Ins_IP( INS_ARG ) + static void + Ins_IP( INS_ARG ) { FT_F26Dot6 org_a, org_b, org_x, cur_a, cur_b, cur_x, @@ -5875,8 +5886,8 @@ /* Opcode range: 0x29 */ /* Stack: uint32 --> */ /* */ - static - void Ins_UTP( INS_ARG ) + static void + Ins_UTP( INS_ARG ) { FT_UShort point; FT_Byte mask; @@ -5911,11 +5922,11 @@ }; - static - void Shift( FT_UInt p1, - FT_UInt p2, - FT_UInt p, - struct LOC_Ins_IUP* LINK ) + static void + Shift( FT_UInt p1, + FT_UInt p2, + FT_UInt p, + struct LOC_Ins_IUP* LINK ) { FT_UInt i; FT_F26Dot6 x; @@ -5931,12 +5942,12 @@ } - static - void Interp( FT_UInt p1, - FT_UInt p2, - FT_UInt ref1, - FT_UInt ref2, - struct LOC_Ins_IUP* LINK ) + static void + Interp( FT_UInt p1, + FT_UInt p2, + FT_UInt ref1, + FT_UInt ref2, + struct LOC_Ins_IUP* LINK ) { FT_UInt i; FT_F26Dot6 x, x1, x2, d1, d2; @@ -6017,8 +6028,8 @@ /* Opcode range: 0x30-0x31 */ /* Stack: --> */ /* */ - static - void Ins_IUP( INS_ARG ) + static void + Ins_IUP( INS_ARG ) { struct LOC_Ins_IUP V; FT_Byte mask; @@ -6111,8 +6122,8 @@ /* Opcode range: 0x5D,0x71,0x72 */ /* Stack: uint32 (2 * uint32)... --> */ /* */ - static - void Ins_DELTAP( INS_ARG ) + static void + Ins_DELTAP( INS_ARG ) { FT_ULong k, nump; FT_UShort A; @@ -6187,8 +6198,8 @@ /* Opcode range: 0x73,0x74,0x75 */ /* Stack: uint32 (2 * uint32)... --> */ /* */ - static - void Ins_DELTAC( INS_ARG ) + static void + Ins_DELTAC( INS_ARG ) { FT_ULong nump, k; FT_ULong A, C; @@ -6269,8 +6280,8 @@ /* */ /* XXX: According to Apple specs, bits 1 & 2 of the argument ought to be */ /* consulted before rotated/stretched info is returned. */ - static - void Ins_GETINFO( INS_ARG ) + static void + Ins_GETINFO( INS_ARG ) { FT_Long K; @@ -6294,8 +6305,8 @@ } - static - void Ins_UNKNOWN( INS_ARG ) + static void + Ins_UNKNOWN( INS_ARG ) { TT_DefRecord* def = CUR.IDefs; TT_DefRecord* limit = def + CUR.numIDefs; @@ -6654,7 +6665,8 @@ /* documentation is in ttinterp.h */ - FT_EXPORT_DEF( FT_Error ) TT_RunIns( TT_ExecContext exc ) + FT_EXPORT_DEF( FT_Error ) + TT_RunIns( TT_ExecContext exc ) { FT_Long ins_counter = 0; /* executed instructions counter */ diff --git a/src/truetype/ttinterp.h b/src/truetype/ttinterp.h index c8a71f999..0b995089a 100644 --- a/src/truetype/ttinterp.h +++ b/src/truetype/ttinterp.h @@ -67,25 +67,30 @@ FT_BEGIN_HEADER /*************************************************************************/ /* Rounding function */ - typedef FT_F26Dot6 (*TT_Round_Func)( EXEC_OP_ FT_F26Dot6 distance, - FT_F26Dot6 compensation ); + typedef FT_F26Dot6 + (*TT_Round_Func)( EXEC_OP_ FT_F26Dot6 distance, + FT_F26Dot6 compensation ); /* Point displacement along the freedom vector routine */ - typedef void (*TT_Move_Func)( EXEC_OP_ TT_GlyphZone* zone, - FT_UInt point, - FT_F26Dot6 distance ); + typedef void + (*TT_Move_Func)( EXEC_OP_ TT_GlyphZone* zone, + FT_UInt point, + FT_F26Dot6 distance ); /* Distance projection along one of the projection vectors */ - typedef FT_F26Dot6 (*TT_Project_Func)( EXEC_OP_ FT_Vector* v1, - FT_Vector* v2 ); + typedef FT_F26Dot6 + (*TT_Project_Func)( EXEC_OP_ FT_Vector* v1, + FT_Vector* v2 ); /* reading a cvt value. Take care of non-square pixels if necessary */ - typedef FT_F26Dot6 (*TT_Get_CVT_Func)( EXEC_OP_ FT_ULong index ); + typedef FT_F26Dot6 + (*TT_Get_CVT_Func)( EXEC_OP_ FT_ULong index ); /* setting or moving a cvt value. Take care of non-square pixels */ /* if necessary */ - typedef void (*TT_Set_CVT_Func)( EXEC_OP_ FT_ULong index, - FT_F26Dot6 value ); + typedef void + (*TT_Set_CVT_Func)( EXEC_OP_ FT_ULong index, + FT_F26Dot6 value ); /*************************************************************************/ @@ -219,20 +224,20 @@ FT_BEGIN_HEADER extern const TT_GraphicsState tt_default_graphics_state; - FT_LOCAL - FT_Error TT_Goto_CodeRange( TT_ExecContext exec, - FT_Int range, - FT_Long IP ); + FT_LOCAL FT_Error + TT_Goto_CodeRange( TT_ExecContext exec, + FT_Int range, + FT_Long IP ); - FT_LOCAL - FT_Error TT_Set_CodeRange( TT_ExecContext exec, - FT_Int range, - void* base, - FT_Long length ); + FT_LOCAL FT_Error + TT_Set_CodeRange( TT_ExecContext exec, + FT_Int range, + void* base, + FT_Long length ); - FT_LOCAL - FT_Error TT_Clear_CodeRange( TT_ExecContext exec, - FT_Int range ); + FT_LOCAL FT_Error + TT_Clear_CodeRange( TT_ExecContext exec, + FT_Int range ); /*************************************************************************/ @@ -254,28 +259,29 @@ FT_BEGIN_HEADER /* */ /* Only the glyph loader and debugger should call this function. */ /* */ - FT_EXPORT( TT_ExecContext ) TT_New_Context( TT_Face face ); + FT_EXPORT( TT_ExecContext ) + TT_New_Context( TT_Face face ); - FT_LOCAL - FT_Error TT_Done_Context( TT_ExecContext exec ); + FT_LOCAL FT_Error + TT_Done_Context( TT_ExecContext exec ); - FT_LOCAL - FT_Error TT_Destroy_Context( TT_ExecContext exec, - FT_Memory memory ); + FT_LOCAL FT_Error + TT_Destroy_Context( TT_ExecContext exec, + FT_Memory memory ); - FT_LOCAL - FT_Error TT_Load_Context( TT_ExecContext exec, - TT_Face face, - TT_Size size ); + FT_LOCAL FT_Error + TT_Load_Context( TT_ExecContext exec, + TT_Face face, + TT_Size size ); - FT_LOCAL - FT_Error TT_Save_Context( TT_ExecContext exec, - TT_Size ins ); + FT_LOCAL FT_Error + TT_Save_Context( TT_ExecContext exec, + TT_Size ins ); - FT_LOCAL - FT_Error TT_Run_Context( TT_ExecContext exec, - FT_Bool debug ); + FT_LOCAL FT_Error + TT_Run_Context( TT_ExecContext exec, + FT_Bool debug ); /*************************************************************************/ @@ -299,7 +305,8 @@ FT_BEGIN_HEADER /* This function is publicly exported because it is directly */ /* invoked by the TrueType debugger. */ /* */ - FT_EXPORT( FT_Error ) TT_RunIns( TT_ExecContext exec ); + FT_EXPORT( FT_Error ) + TT_RunIns( TT_ExecContext exec ); FT_END_HEADER diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c index 6dcce38ff..cd00a96b4 100644 --- a/src/truetype/ttobjs.c +++ b/src/truetype/ttobjs.c @@ -65,8 +65,8 @@ /* */ /* zone :: A pointer to the target glyph zone. */ /* */ - FT_LOCAL_DEF - void TT_Done_GlyphZone( TT_GlyphZone* zone ) + FT_LOCAL_DEF void + TT_Done_GlyphZone( TT_GlyphZone* zone ) { FT_Memory memory = zone->memory; @@ -102,11 +102,11 @@ /* */ /* FreeType error code. 0 means success. */ /* */ - FT_LOCAL_DEF - FT_Error TT_New_GlyphZone( FT_Memory memory, - FT_UShort maxPoints, - FT_Short maxContours, - TT_GlyphZone* zone ) + FT_LOCAL_DEF FT_Error + TT_New_GlyphZone( FT_Memory memory, + FT_UShort maxPoints, + FT_Short maxContours, + TT_GlyphZone* zone ) { FT_Error error; @@ -153,12 +153,12 @@ /* */ /* FreeType error code. 0 means success. */ /* */ - FT_LOCAL_DEF - FT_Error TT_Init_Face( FT_Stream stream, - TT_Face face, - FT_Int face_index, - FT_Int num_params, - FT_Parameter* params ) + FT_LOCAL_DEF FT_Error + TT_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; @@ -224,8 +224,8 @@ /* */ /* face :: A pointer to the face object to destroy. */ /* */ - FT_LOCAL_DEF - void TT_Done_Face( TT_Face face ) + FT_LOCAL_DEF void + TT_Done_Face( TT_Face face ) { FT_Memory memory = face->root.memory; FT_Stream stream = face->root.stream; @@ -277,8 +277,8 @@ /* */ /* FreeType error code. 0 means success. */ /* */ - FT_LOCAL_DEF - FT_Error TT_Init_Size( TT_Size size ) + FT_LOCAL_DEF FT_Error + TT_Init_Size( TT_Size size ) { FT_Error error = TT_Err_Ok; @@ -464,8 +464,8 @@ /* */ /* size :: A handle to the target size object. */ /* */ - FT_LOCAL_DEF - void TT_Done_Size( TT_Size size ) + FT_LOCAL_DEF void + TT_Done_Size( TT_Size size ) { #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER @@ -519,8 +519,8 @@ /* */ /* size :: A handle to the target size object. */ /* */ - static - FT_Error Reset_Outline_Size( TT_Size size ) + static FT_Error + Reset_Outline_Size( TT_Size size ) { TT_Face face; FT_Error error = TT_Err_Ok; @@ -670,8 +670,8 @@ /* */ /* size :: A handle to the target size object. */ /* */ - static - FT_Error Reset_SBit_Size( TT_Size size ) + static FT_Error + Reset_SBit_Size( TT_Size size ) { TT_Face face; FT_Error error = TT_Err_Ok; @@ -756,8 +756,8 @@ /* */ /* size :: A handle to the target size object. */ /* */ - FT_LOCAL_DEF - FT_Error TT_Reset_Size( TT_Size size ) + FT_LOCAL_DEF FT_Error + TT_Reset_Size( TT_Size size ) { FT_Face face; FT_Error error = TT_Err_Ok; @@ -808,8 +808,8 @@ /* */ /* FreeType error code. 0 means success. */ /* */ - FT_LOCAL_DEF - FT_Error TT_Init_Driver( TT_Driver driver ) + FT_LOCAL_DEF FT_Error + TT_Init_Driver( TT_Driver driver ) { FT_Error error; @@ -839,8 +839,8 @@ /* */ /* driver :: A handle to the target TrueType driver. */ /* */ - FT_LOCAL_DEF - void TT_Done_Driver( TT_Driver driver ) + FT_LOCAL_DEF void + TT_Done_Driver( TT_Driver driver ) { /* destroy extensions registry if needed */ diff --git a/src/truetype/ttobjs.h b/src/truetype/ttobjs.h index 51df3c7f4..0a2d1d1dd 100644 --- a/src/truetype/ttobjs.h +++ b/src/truetype/ttobjs.h @@ -107,14 +107,14 @@ FT_BEGIN_HEADER #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER - FT_LOCAL - void TT_Done_GlyphZone( TT_GlyphZone* zone ); + FT_LOCAL void + TT_Done_GlyphZone( TT_GlyphZone* zone ); - FT_LOCAL - FT_Error TT_New_GlyphZone( FT_Memory memory, - FT_UShort maxPoints, - FT_Short maxContours, - TT_GlyphZone* zone ); + FT_LOCAL FT_Error + TT_New_GlyphZone( FT_Memory memory, + FT_UShort maxPoints, + FT_Short maxContours, + TT_GlyphZone* zone ); #endif /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ @@ -378,40 +378,40 @@ FT_BEGIN_HEADER /* */ /* Face functions */ /* */ - FT_LOCAL - FT_Error TT_Init_Face( FT_Stream stream, - TT_Face face, - FT_Int face_index, - FT_Int num_params, - FT_Parameter* params ); + FT_LOCAL FT_Error + TT_Init_Face( FT_Stream stream, + TT_Face face, + FT_Int face_index, + FT_Int num_params, + FT_Parameter* params ); - FT_LOCAL - void TT_Done_Face( TT_Face face ); + FT_LOCAL void + TT_Done_Face( TT_Face face ); /*************************************************************************/ /* */ /* Size functions */ /* */ - FT_LOCAL - FT_Error TT_Init_Size( TT_Size size ); + FT_LOCAL FT_Error + TT_Init_Size( TT_Size size ); - FT_LOCAL - void TT_Done_Size( TT_Size size ); + FT_LOCAL void + TT_Done_Size( TT_Size size ); - FT_LOCAL - FT_Error TT_Reset_Size( TT_Size size ); + FT_LOCAL FT_Error + TT_Reset_Size( TT_Size size ); /*************************************************************************/ /* */ /* Driver functions */ /* */ - FT_LOCAL - FT_Error TT_Init_Driver( TT_Driver driver ); + FT_LOCAL FT_Error + TT_Init_Driver( TT_Driver driver ); - FT_LOCAL - void TT_Done_Driver( TT_Driver driver ); + FT_LOCAL void + TT_Done_Driver( TT_Driver driver ); FT_END_HEADER diff --git a/src/truetype/ttpload.c b/src/truetype/ttpload.c index 6ca3cbd8a..ba6f2b4c2 100644 --- a/src/truetype/ttpload.c +++ b/src/truetype/ttpload.c @@ -54,9 +54,9 @@ /* */ /* FreeType error code. 0 means success. */ /* */ - FT_LOCAL_DEF - FT_Error TT_Load_Locations( TT_Face face, - FT_Stream stream ) + FT_LOCAL_DEF FT_Error + TT_Load_Locations( TT_Face face, + FT_Stream stream ) { FT_Error error; FT_Memory memory = stream->memory; @@ -147,9 +147,9 @@ /* */ /* FreeType error code. 0 means success. */ /* */ - FT_LOCAL_DEF - FT_Error TT_Load_CVT( TT_Face face, - FT_Stream stream ) + FT_LOCAL_DEF FT_Error + TT_Load_CVT( TT_Face face, + FT_Stream stream ) { FT_Error error; FT_Memory memory = stream->memory; @@ -214,9 +214,9 @@ /* */ /* FreeType error code. 0 means success. */ /* */ - FT_LOCAL_DEF - FT_Error TT_Load_Programs( TT_Face face, - FT_Stream stream ) + FT_LOCAL_DEF FT_Error + TT_Load_Programs( TT_Face face, + FT_Stream stream ) { FT_Error error; FT_ULong table_len; diff --git a/src/truetype/ttpload.h b/src/truetype/ttpload.h index d6fb5249c..d307e9168 100644 --- a/src/truetype/ttpload.h +++ b/src/truetype/ttpload.h @@ -27,17 +27,17 @@ FT_BEGIN_HEADER - FT_LOCAL - FT_Error TT_Load_Locations( TT_Face face, - FT_Stream stream ); + FT_LOCAL FT_Error + TT_Load_Locations( TT_Face face, + FT_Stream stream ); - FT_LOCAL - FT_Error TT_Load_CVT( TT_Face face, - FT_Stream stream ); + FT_LOCAL FT_Error + TT_Load_CVT( TT_Face face, + FT_Stream stream ); - FT_LOCAL - FT_Error TT_Load_Programs( TT_Face face, - FT_Stream stream ); + FT_LOCAL FT_Error + TT_Load_Programs( TT_Face face, + FT_Stream stream ); FT_END_HEADER diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c index d68853ab9..89bc7dc9f 100644 --- a/src/type1/t1afm.c +++ b/src/type1/t1afm.c @@ -35,9 +35,9 @@ #define FT_COMPONENT trace_t1afm - FT_LOCAL_DEF - void T1_Done_AFM( FT_Memory memory, - T1_AFM* afm ) + FT_LOCAL_DEF void + T1_Done_AFM( FT_Memory memory, + T1_AFM* afm ) { FREE( afm->kern_pairs ); afm->num_pairs = 0; @@ -53,10 +53,10 @@ /* read a glyph name and return the equivalent glyph index */ - static - FT_UInt afm_atoindex( FT_Byte** start, - FT_Byte* limit, - T1_Font* type1 ) + static FT_UInt + afm_atoindex( FT_Byte** start, + FT_Byte* limit, + T1_Font* type1 ) { FT_Byte* p = *start; FT_Int len; @@ -104,9 +104,9 @@ /* read an integer */ - static - int afm_atoi( FT_Byte** start, - FT_Byte* limit ) + static int + afm_atoi( FT_Byte** start, + FT_Byte* limit ) { FT_Byte* p = *start; int sum = 0; @@ -139,7 +139,7 @@ /* compare two kerning pairs */ - FT_CALLBACK_DEF(int) + FT_CALLBACK_DEF( int ) compare_kern_pairs( const void* a, const void* b ) { @@ -155,9 +155,9 @@ /* parse an AFM file -- for now, only read the kerning pairs */ - FT_LOCAL_DEF - FT_Error T1_Read_AFM( FT_Face t1_face, - FT_Stream stream ) + FT_LOCAL_DEF FT_Error + T1_Read_AFM( FT_Face t1_face, + FT_Stream stream ) { FT_Error error; FT_Memory memory = stream->memory; @@ -241,11 +241,11 @@ /* find the kerning for a given glyph pair */ - FT_LOCAL_DEF - void T1_Get_Kerning( T1_AFM* afm, - FT_UInt glyph1, - FT_UInt glyph2, - FT_Vector* kerning ) + FT_LOCAL_DEF void + T1_Get_Kerning( T1_AFM* afm, + FT_UInt glyph1, + FT_UInt glyph2, + FT_Vector* kerning ) { T1_Kern_Pair *min, *mid, *max; FT_ULong index = KERN_INDEX( glyph1, glyph2 ); diff --git a/src/type1/t1afm.h b/src/type1/t1afm.h index e2d5e3fd6..e3003ff9c 100644 --- a/src/type1/t1afm.h +++ b/src/type1/t1afm.h @@ -43,19 +43,19 @@ FT_BEGIN_HEADER } T1_AFM; - FT_LOCAL - FT_Error T1_Read_AFM( FT_Face face, - FT_Stream stream ); + FT_LOCAL FT_Error + T1_Read_AFM( FT_Face face, + FT_Stream stream ); - FT_LOCAL - void T1_Done_AFM( FT_Memory memory, - T1_AFM* afm ); + FT_LOCAL void + T1_Done_AFM( FT_Memory memory, + T1_AFM* afm ); - FT_LOCAL - void T1_Get_Kerning( T1_AFM* afm, - FT_UInt glyph1, - FT_UInt glyph2, - FT_Vector* kerning ); + FT_LOCAL void + T1_Get_Kerning( T1_AFM* afm, + FT_UInt glyph1, + FT_UInt glyph2, + FT_Vector* kerning ); FT_END_HEADER diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c index c83a5019f..4277d51c7 100644 --- a/src/type1/t1driver.c +++ b/src/type1/t1driver.c @@ -44,11 +44,11 @@ #define FT_COMPONENT trace_t1driver - static - FT_Error get_t1_glyph_name( T1_Face face, - FT_UInt glyph_index, - FT_Pointer buffer, - FT_UInt buffer_max ) + static FT_Error + get_t1_glyph_name( T1_Face face, + FT_UInt glyph_index, + FT_Pointer buffer, + FT_UInt buffer_max ) { FT_String* gname; @@ -98,9 +98,9 @@ /* isn't available (i.e., wasn't compiled in the driver at build */ /* time). */ /* */ - static - FT_Module_Interface Get_Interface( FT_Driver driver, - const FT_String* interface ) + static FT_Module_Interface + Get_Interface( FT_Driver driver, + const FT_String* interface ) { FT_UNUSED( driver ); FT_UNUSED( interface ); @@ -156,11 +156,11 @@ /* */ /* They can be implemented by format-specific interfaces. */ /* */ - static - FT_Error Get_Kerning( T1_Face face, - FT_UInt left_glyph, - FT_UInt right_glyph, - FT_Vector* kerning ) + static FT_Error + Get_Kerning( T1_Face face, + FT_UInt left_glyph, + FT_UInt right_glyph, + FT_Vector* kerning ) { T1_AFM* afm; @@ -194,9 +194,9 @@ /* */ /* Glyph index. 0 means `undefined character code'. */ /* */ - static - FT_UInt Get_Char_Index( FT_CharMap charmap, - FT_Long charcode ) + static FT_UInt + Get_Char_Index( FT_CharMap charmap, + FT_Long charcode ) { T1_Face face; FT_UInt result = 0; @@ -344,7 +344,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 &t1_driver_class; } diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c index 52c92031b..442915418 100644 --- a/src/type1/t1gload.c +++ b/src/type1/t1gload.c @@ -55,7 +55,7 @@ /*************************************************************************/ - FT_CALLBACK_DEF(FT_Error) + FT_CALLBACK_DEF( FT_Error ) T1_Parse_Glyph( T1_Decoder* decoder, FT_UInt glyph_index ) { @@ -73,9 +73,9 @@ } - FT_LOCAL_DEF - FT_Error T1_Compute_Max_Advance( T1_Face face, - FT_Int* max_advance ) + FT_LOCAL_DEF FT_Error + T1_Compute_Max_Advance( T1_Face face, + FT_Int* max_advance ) { FT_Error error; T1_Decoder decoder; @@ -135,11 +135,11 @@ /*************************************************************************/ - FT_LOCAL_DEF - FT_Error T1_Load_Glyph( T1_GlyphSlot glyph, - T1_Size size, - FT_Int glyph_index, - FT_Int load_flags ) + FT_LOCAL_DEF FT_Error + T1_Load_Glyph( T1_GlyphSlot glyph, + T1_Size size, + FT_Int glyph_index, + FT_Int load_flags ) { FT_Error error; T1_Decoder decoder; diff --git a/src/type1/t1gload.h b/src/type1/t1gload.h index 99ca3a225..e9f3f9dcf 100644 --- a/src/type1/t1gload.h +++ b/src/type1/t1gload.h @@ -27,15 +27,15 @@ FT_BEGIN_HEADER - FT_LOCAL - FT_Error T1_Compute_Max_Advance( T1_Face face, - FT_Int* max_advance ); + FT_LOCAL FT_Error + T1_Compute_Max_Advance( T1_Face face, + FT_Int* max_advance ); - FT_LOCAL - FT_Error T1_Load_Glyph( T1_GlyphSlot glyph, - T1_Size size, - FT_Int glyph_index, - FT_Int load_flags ); + FT_LOCAL FT_Error + T1_Load_Glyph( T1_GlyphSlot glyph, + T1_Size size, + FT_Int glyph_index, + FT_Int load_flags ); FT_END_HEADER diff --git a/src/type1/t1load.c b/src/type1/t1load.c index 49342423f..bfc7985d5 100644 --- a/src/type1/t1load.c +++ b/src/type1/t1load.c @@ -96,10 +96,10 @@ /*************************************************************************/ /*************************************************************************/ - static - FT_Error t1_allocate_blend( T1_Face face, - FT_UInt num_designs, - FT_UInt num_axis ) + static FT_Error + t1_allocate_blend( T1_Face face, + FT_UInt num_designs, + FT_UInt num_axis ) { T1_Blend* blend; FT_Memory memory = face->root.memory; @@ -180,9 +180,9 @@ } - FT_LOCAL_DEF - FT_Error T1_Get_Multi_Master( T1_Face face, - FT_Multi_Master* master ) + FT_LOCAL_DEF FT_Error + T1_Get_Multi_Master( T1_Face face, + FT_Multi_Master* master ) { T1_Blend* blend = face->blend; FT_UInt n; @@ -212,10 +212,10 @@ } - FT_LOCAL_DEF - FT_Error T1_Set_MM_Blend( T1_Face face, - FT_UInt num_coords, - FT_Fixed* coords ) + FT_LOCAL_DEF FT_Error + T1_Set_MM_Blend( T1_Face face, + FT_UInt num_coords, + FT_Fixed* coords ) { T1_Blend* blend = face->blend; FT_Error error; @@ -258,10 +258,10 @@ } - FT_LOCAL_DEF - FT_Error T1_Set_MM_Design( T1_Face face, - FT_UInt num_coords, - FT_Long* coords ) + FT_LOCAL_DEF FT_Error + T1_Set_MM_Design( T1_Face face, + FT_UInt num_coords, + FT_Long* coords ) { T1_Blend* blend = face->blend; FT_Error error; @@ -328,8 +328,8 @@ } - FT_LOCAL_DEF - void T1_Done_Blend( T1_Face face ) + FT_LOCAL_DEF void + T1_Done_Blend( T1_Face face ) { FT_Memory memory = face->root.memory; T1_Blend* blend = face->blend; @@ -380,9 +380,9 @@ } - static - void parse_blend_axis_types( T1_Face face, - T1_Loader* loader ) + static void + parse_blend_axis_types( T1_Face face, + T1_Loader* loader ) { T1_Token axis_tokens[ T1_MAX_MM_AXIS ]; FT_Int n, num_axis; @@ -441,9 +441,9 @@ } - static - void parse_blend_design_positions( T1_Face face, - T1_Loader* loader ) + static void + parse_blend_design_positions( T1_Face face, + T1_Loader* loader ) { T1_Token design_tokens[ T1_MAX_MM_DESIGNS ]; FT_Int num_designs; @@ -523,9 +523,9 @@ } - static - void parse_blend_design_map( T1_Face face, - T1_Loader* loader ) + static void + parse_blend_design_map( T1_Face face, + T1_Loader* loader ) { FT_Error error = 0; T1_ParserRec* parser = &loader->parser; @@ -604,9 +604,9 @@ } - static - void parse_weight_vector( T1_Face face, - T1_Loader* loader ) + static void + parse_weight_vector( T1_Face face, + T1_Loader* loader ) { FT_Error error = 0; T1_ParserRec* parser = &loader->parser; @@ -656,9 +656,9 @@ /* with a lot of Postscript garbage behind it (that's completely out */ /* of spec!); we detect it and terminate the parsing */ /* */ - static - void parse_shared_dict( T1_Face face, - T1_Loader* loader ) + static void + parse_shared_dict( T1_Face face, + T1_Loader* loader ) { T1_ParserRec* parser = &loader->parser; @@ -689,10 +689,10 @@ /*************************************************************************/ - static - FT_Error t1_load_keyword( T1_Face face, - T1_Loader* loader, - T1_Field* field ) + static FT_Error + t1_load_keyword( T1_Face face, + T1_Loader* loader, + T1_Field* field ) { FT_Error error; void* dummy_object; @@ -756,25 +756,24 @@ } - static - int is_space( FT_Byte c ) + static int + is_space( FT_Byte c ) { return ( c == ' ' || c == '\t' || c == '\r' || c == '\n' ); } - static - int is_alpha( FT_Byte c ) + static int + is_alpha( FT_Byte c ) { return ( isalnum( c ) || c == '.' || c == '_' || c == '-' ); } - - static - int read_binary_data( T1_ParserRec* parser, - FT_Int* size, - FT_Byte** base ) + static int + read_binary_data( T1_ParserRec* parser, + FT_Int* size, + FT_Byte** base ) { FT_Byte* cur; FT_Byte* limit = parser->root.limit; @@ -813,9 +812,9 @@ /* the `/Encoding', `/Subrs', and `/CharStrings' */ /* dictionaries */ - static - void parse_font_name( T1_Face face, - T1_Loader* loader ) + static void + parse_font_name( T1_Face face, + T1_Loader* loader ) { T1_ParserRec* parser = &loader->parser; FT_Error error; @@ -855,9 +854,9 @@ } - static - void parse_font_bbox( T1_Face face, - T1_Loader* loader ) + static void + parse_font_bbox( T1_Face face, + T1_Loader* loader ) { T1_ParserRec* parser = &loader->parser; FT_Fixed temp[4]; @@ -872,9 +871,9 @@ } - static - void parse_font_matrix( T1_Face face, - T1_Loader* loader ) + static void + parse_font_matrix( T1_Face face, + T1_Loader* loader ) { T1_ParserRec* parser = &loader->parser; FT_Matrix* matrix = &face->type1.font_matrix; @@ -921,9 +920,9 @@ } - static - void parse_encoding( T1_Face face, - T1_Loader* loader ) + static void + parse_encoding( T1_Face face, + T1_Loader* loader ) { T1_ParserRec* parser = &loader->parser; FT_Byte* cur = parser->root.cursor; @@ -1081,9 +1080,9 @@ } - static - void parse_subrs( T1_Face face, - T1_Loader* loader ) + static void + parse_subrs( T1_Face face, + T1_Loader* loader ) { T1_ParserRec* parser = &loader->parser; PS_Table* table = &loader->subrs; @@ -1166,9 +1165,9 @@ } - static - void parse_charstrings( T1_Face face, - T1_Loader* loader ) + static void + parse_charstrings( T1_Face face, + T1_Loader* loader ) { T1_ParserRec* parser = &loader->parser; PS_Table* code_table = &loader->charstrings; @@ -1448,11 +1447,11 @@ }; - static - FT_Error parse_dict( T1_Face face, - T1_Loader* loader, - FT_Byte* base, - FT_Long size ) + static FT_Error + parse_dict( T1_Face face, + T1_Loader* loader, + FT_Byte* base, + FT_Long size ) { T1_ParserRec* parser = &loader->parser; @@ -1565,9 +1564,9 @@ } - static - void t1_init_loader( T1_Loader* loader, - T1_Face face ) + static void + t1_init_loader( T1_Loader* loader, + T1_Face face ) { FT_UNUSED( face ); @@ -1585,8 +1584,8 @@ } - static - void t1_done_loader( T1_Loader* loader ) + static void + t1_done_loader( T1_Loader* loader ) { T1_ParserRec* parser = &loader->parser; @@ -1603,8 +1602,8 @@ } - FT_LOCAL_DEF - FT_Error T1_Open_Face( T1_Face face ) + FT_LOCAL_DEF FT_Error + T1_Open_Face( T1_Face face ) { T1_Loader loader; T1_ParserRec* parser; diff --git a/src/type1/t1load.h b/src/type1/t1load.h index b83aed956..b4ff450c4 100644 --- a/src/type1/t1load.h +++ b/src/type1/t1load.h @@ -51,27 +51,27 @@ FT_BEGIN_HEADER } T1_Loader; - FT_LOCAL - FT_Error T1_Open_Face( T1_Face face ); + FT_LOCAL FT_Error + T1_Open_Face( T1_Face face ); #ifndef T1_CONFIG_OPTION_NO_MM_SUPPORT - FT_LOCAL - FT_Error T1_Get_Multi_Master( T1_Face face, - FT_Multi_Master* master ); + FT_LOCAL FT_Error + T1_Get_Multi_Master( T1_Face face, + FT_Multi_Master* master ); - FT_LOCAL - FT_Error T1_Set_MM_Blend( T1_Face face, - FT_UInt num_coords, - FT_Fixed* coords ); + FT_LOCAL FT_Error + T1_Set_MM_Blend( T1_Face face, + FT_UInt num_coords, + FT_Fixed* coords ); - FT_LOCAL - FT_Error T1_Set_MM_Design( T1_Face face, - FT_UInt num_coords, - FT_Long* coords ); + FT_LOCAL FT_Error + T1_Set_MM_Design( T1_Face face, + FT_UInt num_coords, + FT_Long* coords ); - FT_LOCAL - void T1_Done_Blend( T1_Face face ); + FT_LOCAL void + T1_Done_Blend( T1_Face face ); #endif /* !T1_CONFIG_OPTION_NO_MM_SUPPORT */ diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c index 1e074450e..04975c1a9 100644 --- a/src/type1/t1objs.c +++ b/src/type1/t1objs.c @@ -63,8 +63,8 @@ /* */ /* face :: A typeless pointer to the face object to destroy. */ /* */ - FT_LOCAL_DEF - void T1_Done_Face( T1_Face face ) + FT_LOCAL_DEF void + T1_Done_Face( T1_Face face ) { FT_Memory memory; T1_Font* type1 = &face->type1; @@ -147,12 +147,12 @@ /* */ /* FreeType error code. 0 means success. */ /* */ - FT_LOCAL_DEF - FT_Error T1_Init_Face( FT_Stream stream, - T1_Face face, - FT_Int face_index, - FT_Int num_params, - FT_Parameter* params ) + FT_LOCAL_DEF FT_Error + T1_Init_Face( FT_Stream stream, + T1_Face face, + FT_Int face_index, + FT_Int num_params, + FT_Parameter* params ) { FT_Error error; PSNames_Interface* psnames; @@ -386,8 +386,8 @@ /* */ /* FreeType error code. 0 means success. */ /* */ - FT_LOCAL_DEF - FT_Error T1_Init_Driver( T1_Driver driver ) + FT_LOCAL_DEF FT_Error + T1_Init_Driver( T1_Driver driver ) { FT_UNUSED( driver ); @@ -406,8 +406,8 @@ /* */ /* driver :: A handle to the target Type 1 driver. */ /* */ - FT_LOCAL_DEF - void T1_Done_Driver( T1_Driver driver ) + FT_LOCAL_DEF void + T1_Done_Driver( T1_Driver driver ) { FT_UNUSED( driver ); } diff --git a/src/type1/t1objs.h b/src/type1/t1objs.h index 810380a03..4a5b4e3ea 100644 --- a/src/type1/t1objs.h +++ b/src/type1/t1objs.h @@ -135,21 +135,21 @@ FT_BEGIN_HEADER } T1_GlyphSlotRec; - FT_LOCAL - FT_Error T1_Init_Face( FT_Stream stream, - T1_Face face, - FT_Int face_index, - FT_Int num_params, - FT_Parameter* params ); + FT_LOCAL FT_Error + T1_Init_Face( FT_Stream stream, + T1_Face face, + FT_Int face_index, + FT_Int num_params, + FT_Parameter* params ); - FT_LOCAL - void T1_Done_Face( T1_Face face ); + FT_LOCAL void + T1_Done_Face( T1_Face face ); - FT_LOCAL - FT_Error T1_Init_Driver( T1_Driver driver ); + FT_LOCAL FT_Error + T1_Init_Driver( T1_Driver driver ); - FT_LOCAL - void T1_Done_Driver( T1_Driver driver ); + FT_LOCAL void + T1_Done_Driver( T1_Driver driver ); FT_END_HEADER diff --git a/src/type1/t1parse.c b/src/type1/t1parse.c index 78ab3a209..77fb5f0ea 100644 --- a/src/type1/t1parse.c +++ b/src/type1/t1parse.c @@ -95,10 +95,10 @@ }; - static - FT_Error read_pfb_tag( FT_Stream stream, - FT_UShort* tag, - FT_Long* size ) + static FT_Error + read_pfb_tag( FT_Stream stream, + FT_UShort* tag, + FT_Long* size ) { FT_Error error; PFB_Tag head; @@ -118,11 +118,11 @@ } - FT_LOCAL_DEF - FT_Error T1_New_Parser( T1_ParserRec* parser, - FT_Stream stream, - FT_Memory memory, - PSAux_Interface* psaux ) + FT_LOCAL_DEF FT_Error + T1_New_Parser( T1_ParserRec* parser, + FT_Stream stream, + FT_Memory memory, + PSAux_Interface* psaux ) { FT_Error error; FT_UShort tag; @@ -227,8 +227,8 @@ } - FT_LOCAL_DEF - void T1_Finalize_Parser( T1_ParserRec* parser ) + FT_LOCAL_DEF void + T1_Finalize_Parser( T1_ParserRec* parser ) { FT_Memory memory = parser->root.memory; @@ -245,8 +245,8 @@ /* return the value of an hexadecimal digit */ - static - int hexa_value( char c ) + static int + hexa_value( char c ) { unsigned int d; @@ -267,9 +267,9 @@ } - FT_LOCAL_DEF - FT_Error T1_Get_Private_Dict( T1_ParserRec* parser, - PSAux_Interface* psaux ) + FT_LOCAL_DEF FT_Error + T1_Get_Private_Dict( T1_ParserRec* parser, + PSAux_Interface* psaux ) { FT_Stream stream = parser->stream; FT_Memory memory = parser->root.memory; diff --git a/src/type1/t1parse.h b/src/type1/t1parse.h index 8b91b3ccf..c5a1837ce 100644 --- a/src/type1/t1parse.h +++ b/src/type1/t1parse.h @@ -112,18 +112,18 @@ FT_BEGIN_HEADER (p)->root.funcs.load_field_table( &(p)->root, f, o, m, pf ) - FT_LOCAL - FT_Error T1_New_Parser( T1_ParserRec* parser, - FT_Stream stream, - FT_Memory memory, - PSAux_Interface* psaux ); + FT_LOCAL FT_Error + T1_New_Parser( T1_ParserRec* parser, + FT_Stream stream, + FT_Memory memory, + PSAux_Interface* psaux ); - FT_LOCAL - FT_Error T1_Get_Private_Dict( T1_ParserRec* parser, - PSAux_Interface* psaux ); + FT_LOCAL FT_Error + T1_Get_Private_Dict( T1_ParserRec* parser, + PSAux_Interface* psaux ); - FT_LOCAL - void T1_Finalize_Parser( T1_ParserRec* parser ); + FT_LOCAL void + T1_Finalize_Parser( T1_ParserRec* parser ); FT_END_HEADER diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c index c5e7750a4..547f92474 100644 --- a/src/winfonts/winfnt.c +++ b/src/winfonts/winfnt.c @@ -648,7 +648,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 &winfnt_driver_class; }