Index: src/cff/cffpic.h |
diff --git a/src/cff/cffpic.h b/src/cff/cffpic.h |
index 342edd845207734782dfdfc9c89082c9a4bfb626..50bab4c17399ecba0e90481051eac1752438dc62 100644 |
--- a/src/cff/cffpic.h |
+++ b/src/cff/cffpic.h |
@@ -4,7 +4,7 @@ |
/* */ |
/* The FreeType position independent code services for cff module. */ |
/* */ |
-/* Copyright 2009 by */ |
+/* Copyright 2009, 2012, 2013 by */ |
/* Oran Agra and Mickey Gabel. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -24,16 +24,19 @@ 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 CFF_SERVICE_PS_INFO_GET cff_service_ps_info |
+#define CFF_SERVICE_GLYPH_DICT_GET cff_service_glyph_dict |
+#define CFF_SERVICE_PS_NAME_GET cff_service_ps_name |
+#define CFF_SERVICE_GET_CMAP_INFO_GET cff_service_get_cmap_info |
+#define CFF_SERVICE_CID_INFO_GET cff_service_cid_info |
+#define CFF_SERVICE_PROPERTIES_GET cff_service_properties |
+#define CFF_SERVICES_GET cff_services |
+#define CFF_CMAP_ENCODING_CLASS_REC_GET cff_cmap_encoding_class_rec |
+#define CFF_CMAP_UNICODE_CLASS_REC_GET cff_cmap_unicode_class_rec |
+#define CFF_FIELD_HANDLERS_GET cff_field_handlers |
#else /* FT_CONFIG_OPTION_PIC */ |
@@ -43,30 +46,48 @@ FT_BEGIN_HEADER |
#include FT_SERVICE_POSTSCRIPT_NAME_H |
#include FT_SERVICE_TT_CMAP_H |
#include FT_SERVICE_CID_H |
+#include FT_SERVICE_PROPERTIES_H |
+ |
- typedef struct CffModulePIC_ |
+ 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_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_ServiceDescRec* cff_services; |
+ CFF_Field_Handler* cff_field_handlers; |
+ 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_Service_PropertiesRec cff_service_properties; |
+ FT_CMap_ClassRec cff_cmap_encoding_class_rec; |
+ FT_CMap_ClassRec cff_cmap_unicode_class_rec; |
+ |
} CffModulePIC; |
-#define GET_PIC(lib) ((CffModulePIC*)((lib)->pic_container.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 GET_PIC( lib ) \ |
+ ( (CffModulePIC*)( (lib)->pic_container.cff ) ) |
+ |
+#define CFF_SERVICE_PS_INFO_GET \ |
+ ( GET_PIC( library )->cff_service_ps_info ) |
+#define CFF_SERVICE_GLYPH_DICT_GET \ |
+ ( GET_PIC( library )->cff_service_glyph_dict ) |
+#define CFF_SERVICE_PS_NAME_GET \ |
+ ( GET_PIC( library )->cff_service_ps_name ) |
+#define CFF_SERVICE_GET_CMAP_INFO_GET \ |
+ ( GET_PIC( library )->cff_service_get_cmap_info ) |
+#define CFF_SERVICE_CID_INFO_GET \ |
+ ( GET_PIC( library )->cff_service_cid_info ) |
+#define CFF_SERVICE_PROPERTIES_GET \ |
+ ( GET_PIC( library )->cff_service_properties ) |
+#define CFF_SERVICES_GET \ |
+ ( GET_PIC( library )->cff_services ) |
+#define CFF_CMAP_ENCODING_CLASS_REC_GET \ |
+ ( GET_PIC( library )->cff_cmap_encoding_class_rec ) |
+#define CFF_CMAP_UNICODE_CLASS_REC_GET \ |
+ ( GET_PIC( library )->cff_cmap_unicode_class_rec ) |
+#define CFF_FIELD_HANDLERS_GET \ |
+ ( GET_PIC( library )->cff_field_handlers ) |
/* see cffpic.c for the implementation */ |
void |