diff options
Diffstat (limited to 'src/sfnt/sfntpic.c')
| -rw-r--r-- | src/sfnt/sfntpic.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/sfnt/sfntpic.c b/src/sfnt/sfntpic.c index 681bff183..3e82853bc 100644 --- a/src/sfnt/sfntpic.c +++ b/src/sfnt/sfntpic.c @@ -24,18 +24,18 @@ #ifdef FT_CONFIG_OPTION_PIC /* forward declaration of PIC init functions from sfdriver.c */ - FT_Error FT_Create_Class_sfnt_services( FT_Library, FT_ServiceDescRec**); - void FT_Destroy_Class_sfnt_services( FT_Library, FT_ServiceDescRec*); - void FT_Init_Class_sfnt_service_bdf( FT_Service_BDFRec*); - void FT_Init_Class_sfnt_interface( FT_Library, SFNT_Interface*); - void FT_Init_Class_sfnt_service_glyph_dict( FT_Library, FT_Service_GlyphDictRec*); - void FT_Init_Class_sfnt_service_ps_name( FT_Library, FT_Service_PsFontNameRec*); - void FT_Init_Class_tt_service_get_cmap_info( FT_Library, FT_Service_TTCMapsRec*); - void FT_Init_Class_sfnt_service_sfnt_table( FT_Service_SFNT_TableRec*); + FT_Error ft_library_pic_alloc_sfnt_services( FT_Library, FT_ServiceDescRec**); + void ft_library_pic_free_sfnt_services( FT_Library, FT_ServiceDescRec*); + void ft_pic_init_sfnt_service_bdf( FT_Service_BDFRec*); + void ft_pic_init_sfnt_interface( FT_Library, SFNT_Interface*); + void ft_pic_init_sfnt_service_glyph_dict( FT_Library, FT_Service_GlyphDictRec*); + void ft_pic_init_sfnt_service_ps_name( FT_Library, FT_Service_PsFontNameRec*); + void ft_pic_init_tt_service_get_cmap_info( FT_Library, FT_Service_TTCMapsRec*); + void ft_pic_init_sfnt_service_sfnt_table( FT_Service_SFNT_TableRec*); /* forward declaration of PIC init functions from ttcmap.c */ - FT_Error FT_Create_Class_tt_cmap_classes( FT_Library, TT_CMap_Class**); - void FT_Destroy_Class_tt_cmap_classes( FT_Library, TT_CMap_Class*); + FT_Error ft_library_pic_alloc_tt_cmap_classes( FT_Library, TT_CMap_Class**); + void ft_library_pic_free_tt_cmap_classes( FT_Library, TT_CMap_Class*); void sfnt_module_class_pic_free( FT_Library library ) @@ -48,12 +48,12 @@ sfntModulePIC* container = (sfntModulePIC*)pic_table->sfnt; if(container->sfnt_services) - FT_Destroy_Class_sfnt_services(library, container->sfnt_services); + ft_library_pic_free_sfnt_services(library, container->sfnt_services); container->sfnt_services = NULL; if(container->tt_cmap_classes) { - FT_Destroy_Class_tt_cmap_classes(library, container->tt_cmap_classes); + ft_library_pic_free_tt_cmap_classes(library, container->tt_cmap_classes); container->tt_cmap_classes = NULL; } FT_FREE( container ); @@ -77,23 +77,23 @@ pic_table->sfnt = container; /* initialize pointer table - this is how the module usually expects this data */ - error = FT_Create_Class_sfnt_services(library, &container->sfnt_services); + error = ft_library_pic_alloc_sfnt_services(library, &container->sfnt_services); if(error) goto Exit; - error = FT_Create_Class_tt_cmap_classes(library, &container->tt_cmap_classes); + error = ft_library_pic_alloc_tt_cmap_classes(library, &container->tt_cmap_classes); if(error) goto Exit; - FT_Init_Class_sfnt_service_glyph_dict (library, &container->sfnt_service_glyph_dict); - FT_Init_Class_sfnt_service_ps_name (library, &container->sfnt_service_ps_name); - FT_Init_Class_tt_service_get_cmap_info(library, &container->tt_service_get_cmap_info); + ft_pic_init_sfnt_service_glyph_dict (library, &container->sfnt_service_glyph_dict); + ft_pic_init_sfnt_service_ps_name (library, &container->sfnt_service_ps_name); + ft_pic_init_tt_service_get_cmap_info(library, &container->tt_service_get_cmap_info); - FT_Init_Class_sfnt_service_sfnt_table(&container->sfnt_service_sfnt_table); + ft_pic_init_sfnt_service_sfnt_table(&container->sfnt_service_sfnt_table); #ifdef TT_CONFIG_OPTION_BDF - FT_Init_Class_sfnt_service_bdf (&container->sfnt_service_bdf); + ft_pic_init_sfnt_service_bdf (&container->sfnt_service_bdf); #endif - FT_Init_Class_sfnt_interface(library, &container->sfnt_interface); + ft_pic_init_sfnt_interface(library, &container->sfnt_interface); Exit: if(error) |