Whitespace.
This commit is contained in:
parent
cdd25cc8f0
commit
c52f44d4fd
@ -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,
|
||||
|
@ -47,7 +47,7 @@
|
||||
AF_SCRIPT_NONE,
|
||||
NULL,
|
||||
|
||||
sizeof( AF_ScriptMetricsRec ),
|
||||
sizeof ( AF_ScriptMetricsRec ),
|
||||
|
||||
(AF_Script_InitMetricsFunc) NULL,
|
||||
(AF_Script_ScaleMetricsFunc)NULL,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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
|
||||
|
2
src/cache/ftcbasic.c
vendored
2
src/cache/ftcbasic.c
vendored
@ -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 */
|
||||
|
@ -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,
|
||||
|
||||
|
@ -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,
|
||||
|
@ -269,7 +269,7 @@
|
||||
const FT_Module_Class gxv_module_class =
|
||||
{
|
||||
0,
|
||||
sizeof( FT_ModuleRec ),
|
||||
sizeof ( FT_ModuleRec ),
|
||||
"gxvalid",
|
||||
0x10000L,
|
||||
0x20000L,
|
||||
|
@ -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;
|
||||
|
||||
|
@ -266,7 +266,7 @@
|
||||
const FT_Module_Class otv_module_class =
|
||||
{
|
||||
0,
|
||||
sizeof( FT_ModuleRec ),
|
||||
sizeof ( FT_ModuleRec ),
|
||||
"otvalid",
|
||||
0x10000L,
|
||||
0x20000L,
|
||||
|
@ -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 */
|
||||
};
|
||||
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -123,7 +123,7 @@
|
||||
const FT_Module_Class psaux_module_class =
|
||||
{
|
||||
0,
|
||||
sizeof( FT_ModuleRec ),
|
||||
sizeof ( FT_ModuleRec ),
|
||||
"psaux",
|
||||
0x20000L,
|
||||
0x20000L,
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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,
|
||||
|
@ -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 */
|
||||
|
@ -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 );
|
||||
|
@ -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,
|
||||
|
@ -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 );
|
||||
|
@ -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,
|
||||
|
@ -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;
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user