From c52f44d4fdb6ea11cb1ab316f1924a5dd1bf7444 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Wed, 30 Nov 2011 10:46:53 +0100 Subject: [PATCH] Whitespace. --- src/autofit/afcjk.c | 8 ++++---- src/autofit/afdummy.c | 2 +- src/autofit/afindic.c | 8 ++++---- src/autofit/aflatin.c | 4 ++-- src/autofit/aflatin2.c | 4 ++-- src/bdf/bdfdrivr.c | 6 +++--- src/cache/ftcbasic.c | 2 +- src/cff/cffdrivr.c | 17 +++++++++-------- src/cid/cidriver.c | 8 ++++---- src/gxvalid/gxvmod.c | 2 +- src/gxvalid/gxvprop.c | 2 +- src/otvalid/otvmod.c | 2 +- src/pfr/pfrdrivr.c | 14 +++++++------- src/psaux/afmparse.c | 2 +- src/psaux/psauxmod.c | 2 +- src/psaux/t1decode.c | 4 ++-- src/raster/ftraster.c | 2 +- src/raster/ftrend1.c | 13 ++++++------- src/sfnt/sfdriver.c | 2 +- src/smooth/ftgrays.c | 2 +- src/smooth/ftsmooth.c | 12 ++++++------ src/tools/apinames.c | 8 +++++--- src/truetype/ttdriver.c | 17 ++++++++--------- src/truetype/ttobjs.c | 2 +- src/type1/t1driver.c | 8 ++++---- src/winfonts/winfnt.c | 6 +++--- 26 files changed, 80 insertions(+), 79 deletions(-) diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c index 0acef9c85..e45bdbad3 100644 --- a/src/autofit/afcjk.c +++ b/src/autofit/afcjk.c @@ -2225,11 +2225,11 @@ }; - AF_DEFINE_SCRIPT_CLASS(af_cjk_script_class, + AF_DEFINE_SCRIPT_CLASS( af_cjk_script_class, AF_SCRIPT_CJK, af_cjk_uniranges, - sizeof( AF_CJKMetricsRec ), + sizeof ( AF_CJKMetricsRec ), (AF_Script_InitMetricsFunc) af_cjk_metrics_init, (AF_Script_ScaleMetricsFunc)af_cjk_metrics_scale, @@ -2247,11 +2247,11 @@ }; - AF_DEFINE_SCRIPT_CLASS(af_cjk_script_class, + AF_DEFINE_SCRIPT_CLASS( af_cjk_script_class, AF_SCRIPT_CJK, af_cjk_uniranges, - sizeof( AF_CJKMetricsRec ), + sizeof ( AF_CJKMetricsRec ), (AF_Script_InitMetricsFunc) NULL, (AF_Script_ScaleMetricsFunc)NULL, diff --git a/src/autofit/afdummy.c b/src/autofit/afdummy.c index c71265131..4bf278ce2 100644 --- a/src/autofit/afdummy.c +++ b/src/autofit/afdummy.c @@ -47,7 +47,7 @@ AF_SCRIPT_NONE, NULL, - sizeof( AF_ScriptMetricsRec ), + sizeof ( AF_ScriptMetricsRec ), (AF_Script_InitMetricsFunc) NULL, (AF_Script_ScaleMetricsFunc)NULL, diff --git a/src/autofit/afindic.c b/src/autofit/afindic.c index c232cff78..9c74838fe 100644 --- a/src/autofit/afindic.c +++ b/src/autofit/afindic.c @@ -113,11 +113,11 @@ }; - AF_DEFINE_SCRIPT_CLASS(af_indic_script_class, + AF_DEFINE_SCRIPT_CLASS( af_indic_script_class, AF_SCRIPT_INDIC, af_indic_uniranges, - sizeof( AF_CJKMetricsRec ), + sizeof ( AF_CJKMetricsRec ), (AF_Script_InitMetricsFunc) af_indic_metrics_init, (AF_Script_ScaleMetricsFunc)af_indic_metrics_scale, @@ -135,11 +135,11 @@ }; - AF_DEFINE_SCRIPT_CLASS(af_indic_script_class, + AF_DEFINE_SCRIPT_CLASS( af_indic_script_class, AF_SCRIPT_INDIC, af_indic_uniranges, - sizeof( AF_CJKMetricsRec ), + sizeof ( AF_CJKMetricsRec ), (AF_Script_InitMetricsFunc) NULL, (AF_Script_ScaleMetricsFunc)NULL, diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c index 54fcf7f0a..30145a2b7 100644 --- a/src/autofit/aflatin.c +++ b/src/autofit/aflatin.c @@ -2341,11 +2341,11 @@ }; - AF_DEFINE_SCRIPT_CLASS(af_latin_script_class, + AF_DEFINE_SCRIPT_CLASS( af_latin_script_class, AF_SCRIPT_LATIN, af_latin_uniranges, - sizeof( AF_LatinMetricsRec ), + sizeof ( AF_LatinMetricsRec ), (AF_Script_InitMetricsFunc) af_latin_metrics_init, (AF_Script_ScaleMetricsFunc)af_latin_metrics_scale, diff --git a/src/autofit/aflatin2.c b/src/autofit/aflatin2.c index 23558b879..3906f6a56 100644 --- a/src/autofit/aflatin2.c +++ b/src/autofit/aflatin2.c @@ -2356,11 +2356,11 @@ }; - AF_DEFINE_SCRIPT_CLASS(af_latin2_script_class, + AF_DEFINE_SCRIPT_CLASS( af_latin2_script_class, AF_SCRIPT_LATIN2, af_latin2_uniranges, - sizeof( AF_LatinMetricsRec ), + sizeof ( AF_LatinMetricsRec ), (AF_Script_InitMetricsFunc) af_latin2_metrics_init, (AF_Script_ScaleMetricsFunc)af_latin2_metrics_scale, diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c index a7064e192..f091ed0e0 100644 --- a/src/bdf/bdfdrivr.c +++ b/src/bdf/bdfdrivr.c @@ -870,9 +870,9 @@ THE SOFTWARE. #endif BDF_Glyph_Load, - 0, /* FT_Face_GetKerningFunc */ - 0, /* FT_Face_AttachFunc */ - 0, /* FT_Face_GetAdvancesFunc */ + 0, /* FT_Face_GetKerningFunc */ + 0, /* FT_Face_AttachFunc */ + 0, /* FT_Face_GetAdvancesFunc */ BDF_Size_Request, BDF_Size_Select diff --git a/src/cache/ftcbasic.c b/src/cache/ftcbasic.c index 09d793ecf..8bed6be08 100644 --- a/src/cache/ftcbasic.c +++ b/src/cache/ftcbasic.c @@ -608,7 +608,7 @@ const FTC_SFamilyClassRec ftc_basic_sbit_family_class = { { - sizeof( FTC_BasicFamilyRec ), + sizeof ( FTC_BasicFamilyRec ), ftc_basic_family_compare, ftc_basic_family_init, 0, /* FTC_MruNode_ResetFunc */ diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c index d0406e1b9..61ab70589 100644 --- a/src/cff/cffdrivr.c +++ b/src/cff/cffdrivr.c @@ -625,12 +625,13 @@ #define CFF_SIZE_SELECT 0 #endif - FT_DEFINE_DRIVER(cff_driver_class, + FT_DEFINE_DRIVER( cff_driver_class, + FT_MODULE_FONT_DRIVER | FT_MODULE_DRIVER_SCALABLE | FT_MODULE_DRIVER_HAS_HINTER, - sizeof( CFF_DriverRec ), + sizeof ( CFF_DriverRec ), "cff", 0x10000L, 0x20000L, @@ -642,9 +643,9 @@ cff_get_interface, /* now the specific driver fields */ - sizeof( TT_FaceRec ), - sizeof( CFF_SizeRec ), - sizeof( CFF_GlyphSlotRec ), + sizeof ( TT_FaceRec ), + sizeof ( CFF_SizeRec ), + sizeof ( CFF_GlyphSlotRec ), cff_face_init, cff_face_done, @@ -653,14 +654,14 @@ cff_slot_init, cff_slot_done, - ft_stub_set_char_sizes, /* FT_CONFIG_OPTION_OLD_INTERNALS */ + ft_stub_set_char_sizes, /* FT_CONFIG_OPTION_OLD_INTERNALS */ ft_stub_set_pixel_sizes, /* FT_CONFIG_OPTION_OLD_INTERNALS */ Load_Glyph, cff_get_kerning, - 0, /* FT_Face_AttachFunc */ - cff_get_advances, /* FT_Face_GetAdvancesFunc */ + 0, /* FT_Face_AttachFunc */ + cff_get_advances, cff_size_request, diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c index 86ee3bba3..eefcc234b 100644 --- a/src/cid/cidriver.c +++ b/src/cid/cidriver.c @@ -196,7 +196,7 @@ FT_MODULE_DRIVER_SCALABLE | FT_MODULE_DRIVER_HAS_HINTER, - sizeof( FT_DriverRec ), + sizeof ( FT_DriverRec ), "t1cid", /* module name */ 0x10000L, /* version 1.0 of driver */ 0x20000L, /* requires FreeType 2.0 */ @@ -209,9 +209,9 @@ }, /* then the other font drivers fields */ - sizeof( CID_FaceRec ), - sizeof( CID_SizeRec ), - sizeof( CID_GlyphSlotRec ), + sizeof ( CID_FaceRec ), + sizeof ( CID_SizeRec ), + sizeof ( CID_GlyphSlotRec ), cid_face_init, cid_face_done, diff --git a/src/gxvalid/gxvmod.c b/src/gxvalid/gxvmod.c index b2b16b1ff..502fe5dca 100644 --- a/src/gxvalid/gxvmod.c +++ b/src/gxvalid/gxvmod.c @@ -269,7 +269,7 @@ const FT_Module_Class gxv_module_class = { 0, - sizeof( FT_ModuleRec ), + sizeof ( FT_ModuleRec ), "gxvalid", 0x10000L, 0x20000L, diff --git a/src/gxvalid/gxvprop.c b/src/gxvalid/gxvprop.c index 54777271a..0be21336f 100644 --- a/src/gxvalid/gxvprop.c +++ b/src/gxvalid/gxvprop.c @@ -233,7 +233,7 @@ /* XXX: check range? */ offset = (FT_UShort)( base_value_p->u + - relative_gindex * sizeof( FT_UShort ) ); + relative_gindex * sizeof ( FT_UShort ) ); p = valid->lookuptbl_head + offset; limit = lookuptbl_limit; diff --git a/src/otvalid/otvmod.c b/src/otvalid/otvmod.c index 620e45233..acf213f23 100644 --- a/src/otvalid/otvmod.c +++ b/src/otvalid/otvmod.c @@ -266,7 +266,7 @@ const FT_Module_Class otv_module_class = { 0, - sizeof( FT_ModuleRec ), + sizeof ( FT_ModuleRec ), "otvalid", 0x10000L, 0x20000L, diff --git a/src/pfr/pfrdrivr.c b/src/pfr/pfrdrivr.c index 0053050a2..9533e3707 100644 --- a/src/pfr/pfrdrivr.c +++ b/src/pfr/pfrdrivr.c @@ -173,7 +173,7 @@ FT_MODULE_FONT_DRIVER | FT_MODULE_DRIVER_SCALABLE, - sizeof( FT_DriverRec ), + sizeof ( FT_DriverRec ), "pfr", 0x10000L, @@ -186,9 +186,9 @@ pfr_get_service }, - sizeof( PFR_FaceRec ), - sizeof( PFR_SizeRec ), - sizeof( PFR_SlotRec ), + sizeof ( PFR_FaceRec ), + sizeof ( PFR_SizeRec ), + sizeof ( PFR_SlotRec ), pfr_face_init, pfr_face_done, @@ -205,9 +205,9 @@ pfr_get_kerning, 0, /* FT_Face_AttachFunc */ - 0, /* FT_Face_GetAdvancesFunc */ - 0, /* FT_Size_RequestFunc */ - 0, /* FT_Size_SelectFunc */ + 0, /* FT_Face_GetAdvancesFunc */ + 0, /* FT_Size_RequestFunc */ + 0, /* FT_Size_SelectFunc */ }; diff --git a/src/psaux/afmparse.c b/src/psaux/afmparse.c index d7de3736f..4990b4089 100644 --- a/src/psaux/afmparse.c +++ b/src/psaux/afmparse.c @@ -754,7 +754,7 @@ case AFM_TOKEN_ENDFONTMETRICS: fi->NumKernPair = n + 1; ft_qsort( fi->KernPairs, fi->NumKernPair, - sizeof( AFM_KernPairRec ), + sizeof ( AFM_KernPairRec ), afm_compare_kern_pairs ); return PSaux_Err_Ok; diff --git a/src/psaux/psauxmod.c b/src/psaux/psauxmod.c index 4c3579f7b..4b1249d49 100644 --- a/src/psaux/psauxmod.c +++ b/src/psaux/psauxmod.c @@ -123,7 +123,7 @@ const FT_Module_Class psaux_module_class = { 0, - sizeof( FT_ModuleRec ), + sizeof ( FT_ModuleRec ), "psaux", 0x20000L, 0x20000L, diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c index b3ccbdde0..a46469f92 100644 --- a/src/psaux/t1decode.c +++ b/src/psaux/t1decode.c @@ -400,7 +400,7 @@ if ( decoder->buildchar && decoder->len_buildchar > 0 ) ft_memset( &decoder->buildchar[0], 0, - sizeof( decoder->buildchar[0] ) * decoder->len_buildchar ); + sizeof ( decoder->buildchar[0] ) * decoder->len_buildchar ); FT_TRACE4(( "\n" "Start charstring\n" )); @@ -880,7 +880,7 @@ ft_memcpy( &decoder->buildchar[idx], blend->weight_vector, blend->num_designs * - sizeof( blend->weight_vector[0] ) ); + sizeof ( blend->weight_vector[0] ) ); } break; diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c index 55e2d0d75..1d5d8c52d 100644 --- a/src/raster/ftraster.c +++ b/src/raster/ftraster.c @@ -3481,7 +3481,7 @@ { if ( raster ) { - if ( pool_base && pool_size >= (long)sizeof(TWorker) + 2048 ) + if ( pool_base && pool_size >= (long)sizeof ( TWorker ) + 2048 ) { PWorker worker = (PWorker)pool_base; diff --git a/src/raster/ftrend1.c b/src/raster/ftrend1.c index 28b1b5897..859cb7d86 100644 --- a/src/raster/ftrend1.c +++ b/src/raster/ftrend1.c @@ -244,10 +244,10 @@ } - FT_DEFINE_RENDERER(ft_raster1_renderer_class, - + FT_DEFINE_RENDERER( ft_raster1_renderer_class, + FT_MODULE_RENDERER, - sizeof( FT_RendererRec ), + sizeof ( FT_RendererRec ), "raster1", 0x10000L, @@ -275,11 +275,10 @@ /* to register it by hand in your application. It should only be */ /* used for backwards-compatibility with FT 1.x anyway. */ /* */ - FT_DEFINE_RENDERER(ft_raster5_renderer_class, - - + FT_DEFINE_RENDERER( ft_raster5_renderer_class, + FT_MODULE_RENDERER, - sizeof( FT_RendererRec ), + sizeof ( FT_RendererRec ), "raster5", 0x10000L, diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c index 247aa6799..17ef310bd 100644 --- a/src/sfnt/sfdriver.c +++ b/src/sfnt/sfdriver.c @@ -639,7 +639,7 @@ FT_DEFINE_MODULE(sfnt_module_class, 0, /* not a font driver or renderer */ - sizeof( FT_ModuleRec ), + sizeof ( FT_ModuleRec ), "sfnt", /* driver name */ 0x10000L, /* driver version 1.0 */ diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c index 895e74859..f7d4d0cb8 100644 --- a/src/smooth/ftgrays.c +++ b/src/smooth/ftgrays.c @@ -1784,7 +1784,7 @@ typedef ptrdiff_t FT_PtrDist; cell_start += sizeof ( TCell ) - cell_mod; cell_end = ras.buffer_size; - cell_end -= cell_end % sizeof( TCell ); + cell_end -= cell_end % sizeof ( TCell ); cells_max = (PCell)( (char*)ras.buffer + cell_end ); ras.cells = (PCell)( (char*)ras.buffer + cell_start ); diff --git a/src/smooth/ftsmooth.c b/src/smooth/ftsmooth.c index 1350a5661..7db79b0a3 100644 --- a/src/smooth/ftsmooth.c +++ b/src/smooth/ftsmooth.c @@ -421,10 +421,10 @@ } - FT_DEFINE_RENDERER(ft_smooth_renderer_class, + FT_DEFINE_RENDERER( ft_smooth_renderer_class, FT_MODULE_RENDERER, - sizeof( FT_RendererRec ), + sizeof ( FT_RendererRec ), "smooth", 0x10000L, @@ -448,10 +448,10 @@ ) - FT_DEFINE_RENDERER(ft_smooth_lcd_renderer_class, + FT_DEFINE_RENDERER( ft_smooth_lcd_renderer_class, FT_MODULE_RENDERER, - sizeof( FT_RendererRec ), + sizeof ( FT_RendererRec ), "smooth-lcd", 0x10000L, @@ -474,10 +474,10 @@ (FT_Raster_Funcs*) &FT_GRAYS_RASTER_GET ) - FT_DEFINE_RENDERER(ft_smooth_lcdv_renderer_class, + FT_DEFINE_RENDERER( ft_smooth_lcdv_renderer_class, FT_MODULE_RENDERER, - sizeof( FT_RendererRec ), + sizeof ( FT_RendererRec ), "smooth-lcdv", 0x10000L, diff --git a/src/tools/apinames.c b/src/tools/apinames.c index 99e3028c9..0348e1ab3 100644 --- a/src/tools/apinames.c +++ b/src/tools/apinames.c @@ -86,7 +86,8 @@ names_add( const char* name, if ( num_names >= max_names ) { max_names += (max_names >> 1) + 4; - the_names = (NameRec*)realloc( the_names, sizeof(the_names[0])*max_names ); + the_names = (NameRec*)realloc( the_names, + sizeof ( the_names[0] ) * max_names ); if ( the_names == NULL ) panic( "not enough memory" ); } @@ -115,7 +116,8 @@ name_compare( const void* name1, static void names_sort( void ) { - qsort( the_names, (size_t)num_names, sizeof(the_names[0]), name_compare ); + qsort( the_names, (size_t)num_names, + sizeof ( the_names[0] ), name_compare ); } @@ -169,7 +171,7 @@ names_dump( FILE* out, int len = dot - dll_name; - if ( len > (int)( sizeof( temp ) - 1 ) ) + if ( len > (int)( sizeof ( temp ) - 1 ) ) len = sizeof ( temp ) - 1; memcpy( temp, dll_name, len ); diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c index e70a61123..b2171976a 100644 --- a/src/truetype/ttdriver.c +++ b/src/truetype/ttdriver.c @@ -313,7 +313,7 @@ if ( load_flags & FT_LOAD_NO_HINTING ) { /* both FT_LOAD_NO_HINTING and FT_LOAD_NO_AUTOHINT */ - /* are necessary to disable hinting for tricky fonts */ + /* are necessary to disable hinting for tricky fonts */ if ( FT_IS_TRICKY( face ) ) load_flags &= ~FT_LOAD_NO_HINTING; @@ -440,11 +440,10 @@ #define TT_SIZE_SELECT 0 #endif - FT_DEFINE_DRIVER(tt_driver_class, - - - FT_MODULE_FONT_DRIVER | - FT_MODULE_DRIVER_SCALABLE | + FT_DEFINE_DRIVER( tt_driver_class, + + FT_MODULE_FONT_DRIVER | + FT_MODULE_DRIVER_SCALABLE | TT_HINTER_FLAG, sizeof ( TT_DriverRec ), @@ -468,15 +467,15 @@ tt_size_init, tt_size_done, tt_slot_init, - 0, /* FT_Slot_DoneFunc */ + 0, /* FT_Slot_DoneFunc */ - ft_stub_set_char_sizes, /* FT_CONFIG_OPTION_OLD_INTERNALS */ + ft_stub_set_char_sizes, /* FT_CONFIG_OPTION_OLD_INTERNALS */ ft_stub_set_pixel_sizes, /* FT_CONFIG_OPTION_OLD_INTERNALS */ Load_Glyph, tt_get_kerning, - 0, /* FT_Face_AttachFunc */ + 0, /* FT_Face_AttachFunc */ tt_get_advances, tt_size_request, diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c index fc67072ff..814c713aa 100644 --- a/src/truetype/ttobjs.c +++ b/src/truetype/ttobjs.c @@ -328,7 +328,7 @@ FT_MEM_SET( num_matched_ids, 0, - sizeof( int ) * TRICK_SFNT_IDS_NUM_FACES ); + sizeof ( int ) * TRICK_SFNT_IDS_NUM_FACES ); has_cvt = FALSE; has_fpgm = FALSE; has_prep = FALSE; diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c index 79516aa3e..b9ada023d 100644 --- a/src/type1/t1driver.c +++ b/src/type1/t1driver.c @@ -681,7 +681,7 @@ FT_MODULE_DRIVER_SCALABLE | FT_MODULE_DRIVER_HAS_HINTER, - sizeof( FT_DriverRec ), + sizeof ( FT_DriverRec ), "type1", 0x10000L, @@ -694,9 +694,9 @@ (FT_Module_Requester) Get_Interface, }, - sizeof( T1_FaceRec ), - sizeof( T1_SizeRec ), - sizeof( T1_GlyphSlotRec ), + sizeof ( T1_FaceRec ), + sizeof ( T1_SizeRec ), + sizeof ( T1_GlyphSlotRec ), (FT_Face_InitFunc) T1_Face_Init, (FT_Face_DoneFunc) T1_Face_Done, diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c index 2b1752315..2d229ab2b 100644 --- a/src/winfonts/winfnt.c +++ b/src/winfonts/winfnt.c @@ -1118,9 +1118,9 @@ (FT_Module_Requester) winfnt_get_service }, - sizeof( FNT_FaceRec ), - sizeof( FT_SizeRec ), - sizeof( FT_GlyphSlotRec ), + sizeof ( FNT_FaceRec ), + sizeof ( FT_SizeRec ), + sizeof ( FT_GlyphSlotRec ), (FT_Face_InitFunc) FNT_Face_Init, (FT_Face_DoneFunc) FNT_Face_Done,