More formatting/cleanup, avoid using FT_Something_Xxxx for internal functions

This commit is contained in:
David Turner 2009-04-07 00:47:27 +02:00
parent a0bbc06404
commit 5bac49d830
30 changed files with 125 additions and 125 deletions

View File

@ -211,7 +211,7 @@ FT_BEGIN_HEADER
#define FT_DEFINE_AUTOHINTER_SERVICE(class_, reset_face_, get_global_hints_, \
done_global_hints_, load_glyph_) \
void \
FT_Init_Class_##class_( FT_Library library, \
ft_pic_init_##class_( FT_Library library, \
FT_AutoHinter_ServiceRec* clazz) \
{ \
FT_UNUSED(library); \

View File

@ -352,7 +352,7 @@ FT_BEGIN_HEADER
FT_Error class_##_pic_init( FT_Library library ); \
\
void \
FT_Destroy_Class_##class_( FT_Library library, \
ft_library_pic_free_##class_( FT_Library library, \
FT_Module_Class* clazz ) \
{ \
FT_Memory memory = library->memory; \
@ -363,7 +363,7 @@ FT_BEGIN_HEADER
} \
\
FT_Error \
FT_Create_Class_##class_( FT_Library library, \
ft_library_pic_alloc_##class_( FT_Library library, \
FT_Module_Class** output_class ) \
{ \
FT_Driver_Class clazz; \

View File

@ -223,13 +223,13 @@ FT_BEGIN_HEADER
#else /* FT_CONFIG_OPTION_PIC */
#define FT_DECLARE_CMAP_CLASS(class_) \
void FT_Init_Class_##class_( FT_Library library, FT_CMap_ClassRec* clazz);
void ft_pic_init_##class_( FT_Library library, FT_CMap_ClassRec* clazz);
#define FT_DEFINE_CMAP_CLASS(class_, size_, init_, done_, char_index_, \
char_next_, char_var_index_, char_var_default_, variant_list_, \
charvariant_list_, variantchar_list_) \
void \
FT_Init_Class_##class_( FT_Library library, \
ft_pic_init_##class_( FT_Library library, \
FT_CMap_ClassRec* clazz) \
{ \
FT_UNUSED(library); \
@ -996,7 +996,7 @@ FT_BEGIN_HEADER
#define FT_DEFINE_RASTER_FUNCS(class_, glyph_format_, raster_new_, \
raster_reset_, raster_set_mode_, raster_render_, raster_done_) \
void \
FT_Init_Class_##class_( FT_Raster_Funcs* clazz ) \
ft_pic_init_##class_( FT_Raster_Funcs* clazz ) \
{ \
clazz->glyph_format = glyph_format_; \
clazz->raster_new = raster_new_; \
@ -1050,7 +1050,7 @@ FT_BEGIN_HEADER
#define FT_DEFINE_GLYPH(class_, size_, format_, init_, done_, copy_, \
transform_, bbox_, prepare_) \
void \
FT_Init_Class_##class_( FT_Glyph_Class* clazz ) \
ft_pic_init_##class_( FT_Glyph_Class* clazz ) \
{ \
clazz->glyph_size = size_; \
clazz->glyph_format = format_; \
@ -1136,7 +1136,7 @@ FT_BEGIN_HEADER
FT_Error class_##_pic_init( FT_Library library ); \
\
void \
FT_Destroy_Class_##class_( FT_Library library, \
ft_library_pic_free_##class_( FT_Library library, \
FT_Module_Class* clazz ) \
{ \
FT_Renderer_Class* rclazz = (FT_Renderer_Class*)clazz; \
@ -1147,7 +1147,7 @@ FT_BEGIN_HEADER
} \
\
FT_Error \
FT_Create_Class_##class_( FT_Library library, \
ft_library_pic_alloc_##class_( FT_Library library, \
FT_Module_Class** output_class ) \
{ \
FT_Renderer_Class* clazz; \
@ -1323,10 +1323,10 @@ FT_BEGIN_HEADER
#else /* FT_CONFIG_OPTION_PIC */
#define FT_DECLARE_MODULE(class_) \
FT_Error FT_Create_Class_##class_( FT_Library library, \
FT_Module_Class** output_class ); \
void FT_Destroy_Class_##class_( FT_Library library, \
FT_Module_Class* clazz );
FT_Error ft_library_pic_alloc_##class_( FT_Library library, \
FT_Module_Class** output_class ); \
void ft_library_pic_free_##class_( FT_Library library, \
FT_Module_Class* clazz );
#define FT_DEFINE_ROOT_MODULE(flags_, size_, name_, version_, requires_, \
interface_, init_, done_, get_interface_) \
@ -1348,8 +1348,8 @@ FT_BEGIN_HEADER
FT_Error class_##_pic_init( FT_Library library ); \
\
void \
FT_Destroy_Class_##class_( FT_Library library, \
FT_Module_Class* clazz ) \
ft_library_pic_free_##class_( FT_Library library, \
FT_Module_Class* clazz ) \
{ \
FT_Memory memory = library->memory; \
class_##_pic_free( library ); \
@ -1358,7 +1358,7 @@ FT_BEGIN_HEADER
} \
\
FT_Error \
FT_Create_Class_##class_( FT_Library library, \
ft_library_pic_alloc_##class_( FT_Library library, \
FT_Module_Class** output_class ) \
{ \
FT_Memory memory = library->memory; \

View File

@ -250,7 +250,7 @@ FT_BEGIN_HEADER
#define FT_DEFINE_SERVICEDESCREC1(class_, serv_id_1, serv_data_1) \
void \
FT_Destroy_Class_##class_( FT_Library library, \
ft_library_pic_free_##class_( FT_Library library, \
FT_ServiceDescRec* clazz ) \
{ \
FT_Memory memory = library->memory; \
@ -259,7 +259,7 @@ FT_BEGIN_HEADER
} \
\
FT_Error \
FT_Create_Class_##class_( FT_Library library, \
ft_library_pic_alloc_##class_( FT_Library library, \
FT_ServiceDescRec** output_class) \
{ \
FT_ServiceDescRec* clazz; \
@ -279,7 +279,7 @@ FT_BEGIN_HEADER
#define FT_DEFINE_SERVICEDESCREC2(class_, serv_id_1, serv_data_1, \
serv_id_2, serv_data_2) \
void \
FT_Destroy_Class_##class_( FT_Library library, \
ft_library_pic_free_##class_( FT_Library library, \
FT_ServiceDescRec* clazz ) \
{ \
FT_Memory memory = library->memory; \
@ -288,7 +288,7 @@ FT_BEGIN_HEADER
} \
\
FT_Error \
FT_Create_Class_##class_( FT_Library library, \
ft_library_pic_alloc_##class_( FT_Library library, \
FT_ServiceDescRec** output_class) \
{ \
FT_ServiceDescRec* clazz; \
@ -310,7 +310,7 @@ FT_BEGIN_HEADER
#define FT_DEFINE_SERVICEDESCREC3(class_, serv_id_1, serv_data_1, \
serv_id_2, serv_data_2, serv_id_3, serv_data_3) \
void \
FT_Destroy_Class_##class_( FT_Library library, \
ft_library_pic_free_##class_( FT_Library library, \
FT_ServiceDescRec* clazz ) \
{ \
FT_Memory memory = library->memory; \
@ -319,7 +319,7 @@ FT_BEGIN_HEADER
} \
\
FT_Error \
FT_Create_Class_##class_( FT_Library library, \
ft_library_pic_alloc_##class_( FT_Library library, \
FT_ServiceDescRec** output_class) \
{ \
FT_ServiceDescRec* clazz; \
@ -344,7 +344,7 @@ FT_BEGIN_HEADER
serv_id_2, serv_data_2, serv_id_3, serv_data_3, \
serv_id_4, serv_data_4) \
void \
FT_Destroy_Class_##class_( FT_Library library, \
ft_library_pic_free_##class_( FT_Library library, \
FT_ServiceDescRec* clazz ) \
{ \
FT_Memory memory = library->memory; \
@ -353,7 +353,7 @@ FT_BEGIN_HEADER
} \
\
FT_Error \
FT_Create_Class_##class_( FT_Library library, \
ft_library_pic_alloc_##class_( FT_Library library, \
FT_ServiceDescRec** output_class) \
{ \
FT_ServiceDescRec* clazz; \
@ -380,7 +380,7 @@ FT_BEGIN_HEADER
serv_id_2, serv_data_2, serv_id_3, serv_data_3, serv_id_4, \
serv_data_4, serv_id_5, serv_data_5) \
void \
FT_Destroy_Class_##class_( FT_Library library, \
ft_library_pic_free_##class_( FT_Library library, \
FT_ServiceDescRec* clazz ) \
{ \
FT_Memory memory = library->memory; \
@ -389,7 +389,7 @@ FT_BEGIN_HEADER
} \
\
FT_Error \
FT_Create_Class_##class_( FT_Library library, \
ft_library_pic_alloc_##class_( FT_Library library, \
FT_ServiceDescRec** output_class) \
{ \
FT_ServiceDescRec* clazz; \
@ -419,7 +419,7 @@ FT_BEGIN_HEADER
serv_id_4, serv_data_4, serv_id_5, serv_data_5, \
serv_id_6, serv_data_6) \
void \
FT_Destroy_Class_##class_( FT_Library library, \
ft_library_pic_free_##class_( FT_Library library, \
FT_ServiceDescRec* clazz ) \
{ \
FT_Memory memory = library->memory; \
@ -428,7 +428,7 @@ FT_BEGIN_HEADER
} \
\
FT_Error \
FT_Create_Class_##class_( FT_Library library, \
ft_library_pic_alloc_##class_( FT_Library library, \
FT_ServiceDescRec** output_class) \
{ \
FT_ServiceDescRec* clazz; \

View File

@ -692,7 +692,7 @@ FT_BEGIN_HEADER
#define FT_DEFINE_PSHINTER_INTERFACE(class_, get_globals_funcs_, \
get_t1_funcs_, get_t2_funcs_) \
void \
FT_Init_Class_##class_( FT_Library library, \
ft_pic_init_##class_( FT_Library library, \
PSHinter_Interface* clazz) \
{ \
FT_UNUSED(library); \

View File

@ -57,7 +57,7 @@ FT_BEGIN_HEADER
#define FT_DEFINE_SERVICE_BDFRec(class_, get_charset_id_, get_property_) \
void \
FT_Init_Class_##class_( FT_Service_BDFRec* clazz ) \
ft_pic_init_##class_( FT_Service_BDFRec* clazz ) \
{ \
clazz->get_charset_id = get_charset_id_; \
clazz->get_property = get_property_; \

View File

@ -60,7 +60,7 @@ FT_BEGIN_HEADER
#define FT_DEFINE_SERVICE_CIDREC(class_, get_ros_, \
get_is_cid_, get_cid_from_glyph_index_ ) \
void \
FT_Init_Class_##class_( FT_Library library, \
ft_pic_init_##class_( FT_Library library, \
FT_Service_CIDRec* clazz) \
{ \
FT_UNUSED(library); \

View File

@ -63,7 +63,7 @@ FT_BEGIN_HEADER
#define FT_DEFINE_SERVICE_GLYPHDICTREC(class_, get_name_, name_index_) \
void \
FT_Init_Class_##class_( FT_Library library, \
ft_pic_init_##class_( FT_Library library, \
FT_Service_GlyphDictRec* clazz) \
{ \
FT_UNUSED(library); \

View File

@ -82,7 +82,7 @@ FT_BEGIN_HEADER
#define FT_DEFINE_SERVICE_MULTIMASTERSREC(class_, get_mm_, set_mm_design_, \
set_mm_blend_, get_mm_var_, set_var_design_) \
void \
FT_Init_Class_##class_( FT_Service_MultiMastersRec* clazz ) \
ft_pic_init_##class_( FT_Service_MultiMastersRec* clazz ) \
{ \
clazz->get_mm = get_mm_; \
clazz->set_mm_design = set_mm_design_; \

View File

@ -58,7 +58,7 @@ FT_BEGIN_HEADER
#define FT_DEFINE_SERVICE_PSFONTNAMEREC(class_, get_ps_font_name_) \
void \
FT_Init_Class_##class_( FT_Library library, \
ft_pic_init_##class_( FT_Library library, \
FT_Service_PsFontNameRec* clazz) \
{ \
FT_UNUSED(library); \

View File

@ -136,7 +136,7 @@ FT_BEGIN_HEADER
unicodes_char_index_, unicodes_char_next_, macintosh_name_, \
adobe_std_strings_, adobe_std_encoding_, adobe_expert_encoding_) \
void \
FT_Init_Class_##class_( FT_Library library, \
ft_pic_init_##class_( FT_Library library, \
FT_Service_PsCMapsRec* clazz) \
{ \
FT_UNUSED(library); \

View File

@ -68,7 +68,7 @@ FT_BEGIN_HEADER
#define FT_DEFINE_SERVICE_PSINFOREC(class_, get_font_info_, \
ps_get_font_extra_, has_glyph_names_, get_font_private_) \
void \
FT_Init_Class_##class_( FT_Library library, \
ft_pic_init_##class_( FT_Library library, \
FT_Service_PsInfoRec* clazz) \
{ \
FT_UNUSED(library); \

View File

@ -80,7 +80,7 @@ FT_BEGIN_HEADER
#define FT_DEFINE_SERVICE_SFNT_TABLEREC(class_, load_, get_, info_) \
void \
FT_Init_Class_##class_( FT_Service_SFNT_TableRec* clazz ) \
ft_pic_init_##class_( FT_Service_SFNT_TableRec* clazz ) \
{ \
clazz->load_table = load_; \
clazz->get_table = get_; \

View File

@ -86,7 +86,7 @@ FT_BEGIN_HEADER
#define FT_DEFINE_SERVICE_TTCMAPSREC(class_, get_cmap_info_) \
void \
FT_Init_Class_##class_( FT_Library library, \
ft_pic_init_##class_( FT_Library library, \
FT_Service_TTCMapsRec* clazz) \
{ \
FT_UNUSED(library); \

View File

@ -49,7 +49,7 @@ FT_BEGIN_HEADER
#define FT_DEFINE_SERVICE_TTGLYFREC(class_, get_location_ ) \
void \
FT_Init_Class_##class_( FT_Service_TTGlyfRec* clazz ) \
ft_pic_init_##class_( FT_Service_TTGlyfRec* clazz ) \
{ \
clazz->get_location = get_location_; \
}

View File

@ -842,7 +842,7 @@ FT_BEGIN_HEADER
get_kerning_, load_font_dir_, load_hmtx_, load_eblc_, free_eblc_, \
set_sbit_strike_, load_strike_metrics_, get_metrics_ ) \
void \
FT_Init_Class_##class_( FT_Library library, SFNT_Interface* clazz ) \
ft_pic_init_##class_( FT_Library library, SFNT_Interface* clazz ) \
{ \
FT_UNUSED(library); \
FT_INTERNAL(goto_table,goto_table_) \

View File

@ -24,7 +24,7 @@
#ifdef FT_CONFIG_OPTION_PIC
/* forward declaration of PIC init functions from afmodule.c */
void FT_Init_Class_af_autofitter_service( FT_Library, FT_AutoHinter_ServiceRec*);
void ft_pic_init_af_autofitter_service( FT_Library, FT_AutoHinter_ServiceRec*);
/* forward declaration of PIC init functions from script classes */
#include "aflatin.h"
@ -72,15 +72,15 @@
/* add call to initialization function when you add new scripts */
ss = 0;
FT_Init_Class_af_dummy_script_class(&container->af_script_classes_rec[ss++]);
ft_pic_init_af_dummy_script_class(&container->af_script_classes_rec[ss++]);
#ifdef FT_OPTION_AUTOFIT2
FT_Init_Class_af_latin2_script_class(&container->af_script_classes_rec[ss++]);
ft_pic_init_af_latin2_script_class(&container->af_script_classes_rec[ss++]);
#endif
FT_Init_Class_af_latin_script_class(&container->af_script_classes_rec[ss++]);
FT_Init_Class_af_cjk_script_class(&container->af_script_classes_rec[ss++]);
FT_Init_Class_af_indic_script_class(&container->af_script_classes_rec[ss++]);
ft_pic_init_af_latin_script_class(&container->af_script_classes_rec[ss++]);
ft_pic_init_af_cjk_script_class(&container->af_script_classes_rec[ss++]);
ft_pic_init_af_indic_script_class(&container->af_script_classes_rec[ss++]);
FT_Init_Class_af_autofitter_service(library, &container->af_autofitter_service);
ft_pic_init_af_autofitter_service(library, &container->af_autofitter_service);
/*Exit:*/
if(error)

View File

@ -368,12 +368,12 @@ extern void* _af_debug_hints;
#define AF_DECLARE_SCRIPT_CLASS(script_class) \
FT_LOCAL(void) \
FT_Init_Class_##script_class(AF_ScriptClassRec* ac);
ft_pic_init_##script_class(AF_ScriptClassRec* ac);
#define AF_DEFINE_SCRIPT_CLASS(script_class, script_, ranges, m_size, \
m_init, m_scale, m_done, h_init, h_apply) \
FT_LOCAL_DEF(void) \
FT_Init_Class_##script_class(AF_ScriptClassRec* ac) \
ft_pic_init_##script_class(AF_ScriptClassRec* ac) \
{ \
ac->script = script_; \
ac->script_uni_ranges = ranges; \

View File

@ -24,8 +24,8 @@
#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_pic_init_ft_outline_glyph_class(FT_Glyph_Class*);
void ft_pic_init_ft_bitmap_glyph_class(FT_Glyph_Class*);
/* forward declaration of PIC init functions from ftinit.c */
FT_Error ft_create_default_module_classes(FT_Library);
@ -69,8 +69,8 @@
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_pic_init_ft_outline_glyph_class(&container->ft_outline_glyph_class);
ft_pic_init_ft_bitmap_glyph_class(&container->ft_bitmap_glyph_class);
Exit:
if(error)

View File

@ -88,8 +88,8 @@
/* declare the module's class creation/destruction functions */
#undef FT_USE_MODULE
#define FT_USE_MODULE( type, x ) \
FT_EXTERNC FT_Error FT_Create_Class_##x( FT_Library library, FT_Module_Class** output_class ); \
FT_EXTERNC void FT_Destroy_Class_##x( FT_Library library, FT_Module_Class* clazz );
FT_EXTERNC FT_Error ft_library_pic_alloc_##x( FT_Library library, FT_Module_Class** output_class ); \
FT_EXTERNC void ft_library_pic_free_##x( FT_Library library, FT_Module_Class* clazz );
#include FT_CONFIG_MODULES_H
@ -106,7 +106,7 @@
/* destroy all module classes */
#undef FT_USE_MODULE
#define FT_USE_MODULE( type, x ) \
if ( classes[i] ) { FT_Destroy_Class_##x(library, classes[i]); } \
if ( classes[i] ) { ft_library_pic_free_##x(library, classes[i]); } \
i++; \
FT_BASE_DEF( void )
@ -133,7 +133,7 @@
/* initialize all module classes and the pointer table */
#undef FT_USE_MODULE
#define FT_USE_MODULE( type, x ) \
error = FT_Create_Class_##x(library, &clazz); \
error = ft_library_pic_alloc_##x(library, &clazz); \
if (error) goto Exit; \
classes[i++] = clazz;

View File

@ -620,14 +620,14 @@
#else /* FT_CONFIG_OPTION_PIC */
void FT_Destroy_Class_cff_field_handlers(FT_Library library, CFF_Field_Handler* clazz)
void ft_library_pic_free_cff_field_handlers(FT_Library library, CFF_Field_Handler* clazz)
{
FT_Memory memory = library->memory;
if ( clazz )
FT_FREE( clazz );
}
FT_Error FT_Create_Class_cff_field_handlers(FT_Library library, CFF_Field_Handler** output_class)
FT_Error ft_library_pic_alloc_cff_field_handlers(FT_Library library, CFF_Field_Handler** output_class)
{
CFF_Field_Handler* clazz;
FT_Error error;

View File

@ -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)

View File

@ -24,7 +24,7 @@
#ifdef FT_CONFIG_OPTION_PIC
/* forward declaration of PIC init functions from pshmod.c */
void FT_Init_Class_pshinter_interface( FT_Library, PSHinter_Interface*);
void ft_pic_init_pshinter_interface( FT_Library, PSHinter_Interface*);
void
pshinter_module_class_pic_free( FT_Library library )
@ -55,7 +55,7 @@
pic_table->pshinter = container;
/* add call to initialization function when you add new scripts */
FT_Init_Class_pshinter_interface(library, &container->pshinter_interface);
ft_pic_init_pshinter_interface(library, &container->pshinter_interface);
/*Exit:*/
if(error)

View File

@ -24,9 +24,9 @@
#ifdef FT_CONFIG_OPTION_PIC
/* forward declaration of PIC init functions from psmodule.c */
FT_Error FT_Create_Class_pscmaps_services ( FT_Library, FT_ServiceDescRec** );
void FT_Destroy_Class_pscmaps_services( FT_Library, FT_ServiceDescRec* );
void FT_Init_Class_pscmaps_interface ( FT_Library, FT_Service_PsCMapsRec* );
FT_Error ft_library_pic_alloc_pscmaps_services ( FT_Library, FT_ServiceDescRec** );
void ft_library_pic_free_pscmaps_services( FT_Library, FT_ServiceDescRec* );
void ft_pic_init_pscmaps_interface ( FT_Library, FT_Service_PsCMapsRec* );
void
psnames_module_class_pic_free( FT_Library library )
@ -41,7 +41,7 @@
if(container->pscmaps_services)
FT_Destroy_Class_pscmaps_services(library, container->pscmaps_services);
ft_library_pic_free_pscmaps_services(library, container->pscmaps_services);
container->pscmaps_services = NULL;
FT_FREE( container );
@ -66,11 +66,11 @@
pic_table->psnames = container;
/* initialize pointer table - this is how the module usually expects this data */
error = FT_Create_Class_pscmaps_services(library, &container->pscmaps_services);
error = ft_library_pic_alloc_pscmaps_services(library, &container->pscmaps_services);
if(error)
goto Exit;
FT_Init_Class_pscmaps_interface(library, &container->pscmaps_interface);
ft_pic_init_pscmaps_interface(library, &container->pscmaps_interface);
Exit:
if(error)

View File

@ -24,7 +24,7 @@
#ifdef FT_CONFIG_OPTION_PIC
/* forward declaration of PIC init functions from ftraster.c */
void FT_Init_Class_ft_standard_raster(FT_Raster_Funcs*);
void ft_pic_init_ft_standard_raster(FT_Raster_Funcs*);
void
ft_raster1_renderer_class_pic_free( FT_Library library )
@ -69,7 +69,7 @@
container->ref_count = 1;
/* initialize pointer table - this is how the module usually expects this data */
FT_Init_Class_ft_standard_raster(&container->ft_standard_raster);
ft_pic_init_ft_standard_raster(&container->ft_standard_raster);
/*Exit:*/
if(error)
ft_raster1_renderer_class_pic_free(library);

View File

@ -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)

View File

@ -3339,14 +3339,14 @@
#else /*FT_CONFIG_OPTION_PIC*/
void FT_Destroy_Class_tt_cmap_classes(FT_Library library, TT_CMap_Class* clazz)
void ft_library_pic_free_tt_cmap_classes(FT_Library library, TT_CMap_Class* clazz)
{
FT_Memory memory = library->memory;
if ( clazz )
FT_FREE( clazz );
}
FT_Error FT_Create_Class_tt_cmap_classes(FT_Library library, TT_CMap_Class** output_class)
FT_Error ft_library_pic_alloc_tt_cmap_classes(FT_Library library, TT_CMap_Class** output_class)
{
TT_CMap_Class* clazz;
TT_CMap_ClassRec* recs;
@ -3367,7 +3367,7 @@
#undef TTCMAPCITEM
#define TTCMAPCITEM(a) \
FT_Init_Class_##a(&recs[i]); \
ft_pic_init_##a(&recs[i]); \
clazz[i] = &recs[i]; \
i++;
#include "ttcmapc.h"

View File

@ -77,7 +77,7 @@ FT_BEGIN_HEADER
charvariant_list_,variantchar_list_, \
format_, validate_, get_cmap_info_) \
void \
FT_Init_Class_##class_( TT_CMap_ClassRec* clazz ) \
ft_pic_init_##class_( TT_CMap_ClassRec* clazz ) \
{ \
clazz->clazz.size = size_; \
clazz->clazz.init = init_; \

View File

@ -24,7 +24,7 @@
#ifdef FT_CONFIG_OPTION_PIC
/* forward declaration of PIC init functions from ftgrays.c */
void FT_Init_Class_ft_grays_raster(FT_Raster_Funcs*);
void ft_pic_init_ft_grays_raster(FT_Raster_Funcs*);
void
ft_smooth_renderer_class_pic_free( FT_Library library )
@ -69,7 +69,7 @@
container->ref_count = 1;
/* initialize pointer table - this is how the module usually expects this data */
FT_Init_Class_ft_grays_raster(&container->ft_grays_raster);
ft_pic_init_ft_grays_raster(&container->ft_grays_raster);
/*Exit:*/
if(error)
ft_smooth_renderer_class_pic_free(library);

View File

@ -24,10 +24,10 @@
#ifdef FT_CONFIG_OPTION_PIC
/* forward declaration of PIC init functions from ttdriver.c */
FT_Error FT_Create_Class_tt_services( FT_Library, FT_ServiceDescRec**);
void FT_Destroy_Class_tt_services( FT_Library, FT_ServiceDescRec*);
void FT_Init_Class_tt_service_gx_multi_masters(FT_Service_MultiMastersRec*);
void FT_Init_Class_tt_service_truetype_glyf(FT_Service_TTGlyfRec*);
FT_Error ft_library_pic_alloc_tt_services( FT_Library, FT_ServiceDescRec**);
void ft_library_pic_free_tt_services( FT_Library, FT_ServiceDescRec*);
void ft_pic_init_tt_service_gx_multi_masters(FT_Service_MultiMastersRec*);
void ft_pic_init_tt_service_truetype_glyf(FT_Service_TTGlyfRec*);
void
tt_driver_class_pic_free( FT_Library library )
@ -41,7 +41,7 @@
if(container->tt_services)
{
FT_Destroy_Class_tt_services(library, container->tt_services);
ft_library_pic_free_tt_services(library, container->tt_services);
container->tt_services = NULL;
}
FT_FREE( container );
@ -65,13 +65,13 @@
pic_table->truetype = container;
/* initialize pointer table - this is how the module usually expects this data */
error = FT_Create_Class_tt_services(library, &container->tt_services);
error = ft_library_pic_alloc_tt_services(library, &container->tt_services);
if(error)
goto Exit;
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
FT_Init_Class_tt_service_gx_multi_masters(&container->tt_service_gx_multi_masters);
ft_pic_init_tt_service_gx_multi_masters(&container->tt_service_gx_multi_masters);
#endif
FT_Init_Class_tt_service_truetype_glyf(&container->tt_service_truetype_glyf);
ft_pic_init_tt_service_truetype_glyf(&container->tt_service_truetype_glyf);
Exit:
if(error)