diff options
Diffstat (limited to 'src/cff/cffpic.c')
| -rw-r--r-- | src/cff/cffpic.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/cff/cffpic.c b/src/cff/cffpic.c index 4c7b2ff66..2a29ce290 100644 --- a/src/cff/cffpic.c +++ b/src/cff/cffpic.c @@ -24,21 +24,21 @@ #ifdef FT_CONFIG_OPTION_PIC /* forward declaration of PIC init functions from cffdrivr.c */ - FT_Error FT_Create_Class_cff_services( FT_Library, FT_ServiceDescRec**); - void FT_Destroy_Class_cff_services( FT_Library, FT_ServiceDescRec*); - void FT_Init_Class_cff_service_ps_info( FT_Library, FT_Service_PsInfoRec*); - void FT_Init_Class_cff_service_glyph_dict( FT_Library, FT_Service_GlyphDictRec*); - void FT_Init_Class_cff_service_ps_name( FT_Library, FT_Service_PsFontNameRec*); - void FT_Init_Class_cff_service_get_cmap_info( FT_Library, FT_Service_TTCMapsRec*); - void FT_Init_Class_cff_service_cid_info( FT_Library, FT_Service_CIDRec*); + FT_Error ft_library_pic_alloc_cff_services( FT_Library, FT_ServiceDescRec**); + void ft_library_pic_free_cff_services( FT_Library, FT_ServiceDescRec*); + void ft_pic_init_cff_service_ps_info( FT_Library, FT_Service_PsInfoRec*); + void ft_pic_init_cff_service_glyph_dict( FT_Library, FT_Service_GlyphDictRec*); + void ft_pic_init_cff_service_ps_name( FT_Library, FT_Service_PsFontNameRec*); + void ft_pic_init_cff_service_get_cmap_info( FT_Library, FT_Service_TTCMapsRec*); + void ft_pic_init_cff_service_cid_info( FT_Library, FT_Service_CIDRec*); /* forward declaration of PIC init functions from cffparse.c */ - FT_Error FT_Create_Class_cff_field_handlers( FT_Library, CFF_Field_Handler**); - void FT_Destroy_Class_cff_field_handlers( FT_Library, CFF_Field_Handler*); + FT_Error ft_library_pic_alloc_cff_field_handlers( FT_Library, CFF_Field_Handler**); + void ft_library_pic_free_cff_field_handlers( FT_Library, CFF_Field_Handler*); /* forward declaration of PIC init functions from cffcmap.c */ - void FT_Init_Class_cff_cmap_encoding_class_rec( FT_Library, FT_CMap_ClassRec*); - void FT_Init_Class_cff_cmap_unicode_class_rec( FT_Library, FT_CMap_ClassRec*); + void ft_pic_init_cff_cmap_encoding_class_rec( FT_Library, FT_CMap_ClassRec*); + void ft_pic_init_cff_cmap_unicode_class_rec( FT_Library, FT_CMap_ClassRec*); void cff_driver_class_pic_free( FT_Library library ) @@ -52,12 +52,12 @@ if(container->cff_services) - FT_Destroy_Class_cff_services(library, container->cff_services); + ft_library_pic_free_cff_services(library, container->cff_services); container->cff_services = NULL; if(container->cff_field_handlers) { - FT_Destroy_Class_cff_field_handlers(library, container->cff_field_handlers); + ft_library_pic_free_cff_field_handlers(library, container->cff_field_handlers); container->cff_field_handlers = NULL; } FT_FREE( container ); @@ -80,24 +80,24 @@ pic_table->cff = container; /* initialize pointer table - this is how the module usually expects this data */ - error = FT_Create_Class_cff_services(library, &container->cff_services); + error = ft_library_pic_alloc_cff_services(library, &container->cff_services); if(error) goto Exit; - error = FT_Create_Class_cff_field_handlers(library, &container->cff_field_handlers); + error = ft_library_pic_alloc_cff_field_handlers(library, &container->cff_field_handlers); if(error) goto Exit; - FT_Init_Class_cff_service_ps_info (library, &container->cff_service_ps_info); - FT_Init_Class_cff_service_glyph_dict (library, &container->cff_service_glyph_dict); - FT_Init_Class_cff_service_ps_name (library, &container->cff_service_ps_name); + ft_pic_init_cff_service_ps_info (library, &container->cff_service_ps_info); + ft_pic_init_cff_service_glyph_dict (library, &container->cff_service_glyph_dict); + ft_pic_init_cff_service_ps_name (library, &container->cff_service_ps_name); - FT_Init_Class_cff_service_get_cmap_info(library, &container->cff_service_get_cmap_info); - FT_Init_Class_cff_service_cid_info (library, &container->cff_service_cid_info); + ft_pic_init_cff_service_get_cmap_info(library, &container->cff_service_get_cmap_info); + ft_pic_init_cff_service_cid_info (library, &container->cff_service_cid_info); - FT_Init_Class_cff_cmap_encoding_class_rec (library, + ft_pic_init_cff_cmap_encoding_class_rec (library, &container->cff_cmap_encoding_class_rec); - FT_Init_Class_cff_cmap_unicode_class_rec (library, + ft_pic_init_cff_cmap_unicode_class_rec (library, &container->cff_cmap_unicode_class_rec); Exit: if(error) |