diff options
Diffstat (limited to 'src/cff/cffpic.h')
| -rw-r--r-- | src/cff/cffpic.h | 49 |
1 files changed, 22 insertions, 27 deletions
diff --git a/src/cff/cffpic.h b/src/cff/cffpic.h index cfdac8525..9f4d739ad 100644 --- a/src/cff/cffpic.h +++ b/src/cff/cffpic.h @@ -25,15 +25,7 @@ FT_BEGIN_HEADER #include FT_INTERNAL_PIC_H #ifndef FT_CONFIG_OPTION_PIC -#define FT_CFF_SERVICE_PS_INFO_GET cff_service_ps_info -#define FT_CFF_SERVICE_GLYPH_DICT_GET cff_service_glyph_dict -#define FT_CFF_SERVICE_PS_NAME_GET cff_service_ps_name -#define FT_CFF_SERVICE_GET_CMAP_INFO_GET cff_service_get_cmap_info -#define FT_CFF_SERVICE_CID_INFO_GET cff_service_cid_info -#define FT_CFF_SERVICES_GET cff_services -#define FT_CFF_CMAP_ENCODING_CLASS_REC_GET cff_cmap_encoding_class_rec -#define FT_CFF_CMAP_UNICODE_CLASS_REC_GET cff_cmap_unicode_class_rec -#define FT_CFF_FIELD_HANDLERS_GET cff_field_handlers +#define FT_CFF_CONST_(name_) cff_##name_ #else /* FT_CONFIG_OPTION_PIC */ @@ -46,30 +38,33 @@ FT_BEGIN_HEADER typedef struct CffModulePIC_ { - FT_ServiceDescRec* cff_services; - CFF_Field_Handler* cff_field_handlers; - FT_Service_PsInfoRec cff_service_ps_info; - FT_Service_GlyphDictRec cff_service_glyph_dict; + FT_ServiceDescRec* cff_services; + FT_Service_PsInfoRec cff_service_ps_info; + FT_Service_GlyphDictRec cff_service_glyph_dict; FT_Service_PsFontNameRec cff_service_ps_name; - FT_Service_TTCMapsRec cff_service_get_cmap_info; - FT_Service_CIDRec cff_service_cid_info; - FT_CMap_ClassRec cff_cmap_encoding_class_rec; - FT_CMap_ClassRec cff_cmap_unicode_class_rec; + FT_Service_TTCMapsRec cff_service_get_cmap_info; + FT_Service_CIDRec cff_service_cid_info; + FT_CMap_ClassRec cff_cmap_encoding_class_rec; + FT_CMap_ClassRec cff_cmap_unicode_class_rec; + CFF_Field_Handler* cff_field_handlers; } CffModulePIC; -#define GET_PIC(lib) ((CffModulePIC*)((lib)->pic_table.cff)) -#define FT_CFF_SERVICE_PS_INFO_GET (GET_PIC(library)->cff_service_ps_info) -#define FT_CFF_SERVICE_GLYPH_DICT_GET (GET_PIC(library)->cff_service_glyph_dict) -#define FT_CFF_SERVICE_PS_NAME_GET (GET_PIC(library)->cff_service_ps_name) -#define FT_CFF_SERVICE_GET_CMAP_INFO_GET (GET_PIC(library)->cff_service_get_cmap_info) -#define FT_CFF_SERVICE_CID_INFO_GET (GET_PIC(library)->cff_service_cid_info) -#define FT_CFF_SERVICES_GET (GET_PIC(library)->cff_services) -#define FT_CFF_CMAP_ENCODING_CLASS_REC_GET (GET_PIC(library)->cff_cmap_encoding_class_rec) -#define FT_CFF_CMAP_UNICODE_CLASS_REC_GET (GET_PIC(library)->cff_cmap_unicode_class_rec) -#define FT_CFF_FIELD_HANDLERS_GET (GET_PIC(library)->cff_field_handlers) +#define CFF_GET_PIC(lib) ((CffModulePIC*)((lib)->pic_table.cff)) +#define FT_CFF_CONST_(name_) (CFF_GET_PIC(library)->cff_##name_) #endif /* FT_CONFIG_OPTION_PIC */ +#define FT_CFF_SERVICE_PS_INFO_GET FT_CFF_CONST_(service_ps_info) +#define FT_CFF_SERVICE_GLYPH_DICT_GET FT_CFF_CONST_(service_glyph_dict) +#define FT_CFF_SERVICE_PS_NAME_GET FT_CFF_CONST_(service_ps_name) +#define FT_CFF_SERVICE_GET_CMAP_INFO_GET FT_CFF_CONST_(service_get_cmap_info) +#define FT_CFF_SERVICE_CID_INFO_GET FT_CFF_CONST_(service_cid_info) +#define FT_CFF_SERVICES_GET FT_CFF_CONST_(services) +#define FT_CFF_CMAP_ENCODING_CLASS_REC_GET FT_CFF_CONST_(cmap_encoding_class_rec) +#define FT_CFF_CMAP_UNICODE_CLASS_REC_GET FT_CFF_CONST_(cmap_unicode_class_rec) +#define FT_CFF_FIELD_HANDLERS_GET FT_CFF_CONST_(field_handlers) + + /* */ FT_END_HEADER |