| Index: src/base/basepic.c
|
| diff --git a/src/base/basepic.c b/src/base/basepic.c
|
| index c0bccb6959b210ddd96b518c834505ec27a26d6e..d754eb1b0363f5e9431f2ed2acb6ea4e58e47ee9 100644
|
| --- a/src/base/basepic.c
|
| +++ b/src/base/basepic.c
|
| @@ -24,18 +24,24 @@
|
| #ifdef FT_CONFIG_OPTION_PIC
|
|
|
| /* forward declaration of PIC init functions from ftglyph.c */
|
| - void FT_Init_Class_ft_outline_glyph_class(FT_Glyph_Class*);
|
| - void FT_Init_Class_ft_bitmap_glyph_class(FT_Glyph_Class*);
|
| + void FT_Init_Class_ft_outline_glyph_class( FT_Glyph_Class* clazz );
|
| + void FT_Init_Class_ft_bitmap_glyph_class( FT_Glyph_Class* clazz );
|
| +
|
| + /* forward declaration of PIC init function from ftrfork.c (not modularized) */
|
| + void FT_Init_Table_raccess_guess_table( ft_raccess_guess_rec* record );
|
|
|
| /* forward declaration of PIC init functions from ftinit.c */
|
| - FT_Error ft_create_default_module_classes(FT_Library);
|
| - void ft_destroy_default_module_classes(FT_Library);
|
| + FT_Error
|
| + ft_create_default_module_classes( FT_Library library );
|
| +
|
| + void
|
| + ft_destroy_default_module_classes( FT_Library library );
|
|
|
| void
|
| - ft_base_pic_free( FT_Library library )
|
| + ft_base_pic_free( FT_Library library )
|
| {
|
| - FT_PIC_Container* pic_container = &library->pic_container;
|
| - FT_Memory memory = library->memory;
|
| + FT_PIC_Container* pic_container = &library->pic_container;
|
| + FT_Memory memory = library->memory;
|
| if ( pic_container->base )
|
| {
|
| /* Destroy default module classes (in case FT_Add_Default_Modules was used) */
|
| @@ -48,17 +54,17 @@
|
|
|
|
|
| FT_Error
|
| - ft_base_pic_init( FT_Library library )
|
| + ft_base_pic_init( FT_Library library )
|
| {
|
| - FT_PIC_Container* pic_container = &library->pic_container;
|
| - FT_Error error = FT_Err_Ok;
|
| - BasePIC* container;
|
| - FT_Memory memory = library->memory;
|
| + FT_PIC_Container* pic_container = &library->pic_container;
|
| + FT_Error error = FT_Err_Ok;
|
| + BasePIC* container;
|
| + FT_Memory memory = library->memory;
|
|
|
| /* allocate pointer, clear and set global container pointer */
|
| if ( FT_ALLOC ( container, sizeof ( *container ) ) )
|
| return error;
|
| - FT_MEM_SET( container, 0, sizeof(*container) );
|
| + FT_MEM_SET( container, 0, sizeof ( *container ) );
|
| pic_container->base = container;
|
|
|
| /* initialize default modules list and pointers */
|
| @@ -67,12 +73,16 @@
|
| goto Exit;
|
|
|
| /* initialize pointer table - this is how the module usually expects this data */
|
| - FT_Init_Class_ft_outline_glyph_class(&container->ft_outline_glyph_class);
|
| - FT_Init_Class_ft_bitmap_glyph_class(&container->ft_bitmap_glyph_class);
|
| + FT_Init_Class_ft_outline_glyph_class(
|
| + &container->ft_outline_glyph_class );
|
| + FT_Init_Class_ft_bitmap_glyph_class(
|
| + &container->ft_bitmap_glyph_class );
|
| + FT_Init_Table_raccess_guess_table(
|
| + (ft_raccess_guess_rec*)&container->ft_raccess_guess_table);
|
|
|
| Exit:
|
| - if(error)
|
| - ft_base_pic_free(library);
|
| + if( error )
|
| + ft_base_pic_free( library );
|
| return error;
|
| }
|
|
|
|
|