Index: src/truetype/ttpic.h |
diff --git a/src/truetype/ttpic.h b/src/truetype/ttpic.h |
index 48f43a5f9271b57770aba84a2489ec5a6c585557..cfb4ee628125fa09555a25c9d2db1d87e23994ca 100644 |
--- a/src/truetype/ttpic.h |
+++ b/src/truetype/ttpic.h |
@@ -4,7 +4,7 @@ |
/* */ |
/* The FreeType position independent code services for truetype 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, */ |
@@ -23,29 +23,43 @@ |
FT_BEGIN_HEADER |
#ifndef FT_CONFIG_OPTION_PIC |
-#define FT_TT_SERVICES_GET tt_services |
-#define FT_TT_SERVICE_GX_MULTI_MASTERS_GET tt_service_gx_multi_masters |
-#define FT_TT_SERVICE_TRUETYPE_GLYF_GET tt_service_truetype_glyf |
+ |
+#define TT_SERVICES_GET tt_services |
+#define TT_SERVICE_GX_MULTI_MASTERS_GET tt_service_gx_multi_masters |
+#define TT_SERVICE_TRUETYPE_GLYF_GET tt_service_truetype_glyf |
+#define TT_SERVICE_PROPERTIES_GET tt_service_properties |
#else /* FT_CONFIG_OPTION_PIC */ |
#include FT_MULTIPLE_MASTERS_H |
#include FT_SERVICE_MULTIPLE_MASTERS_H |
#include FT_SERVICE_TRUETYPE_GLYF_H |
+#include FT_SERVICE_PROPERTIES_H |
+ |
- typedef struct TTModulePIC_ |
+ typedef struct TTModulePIC_ |
{ |
- FT_ServiceDescRec* tt_services; |
+ FT_ServiceDescRec* tt_services; |
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT |
- FT_Service_MultiMastersRec tt_service_gx_multi_masters; |
+ FT_Service_MultiMastersRec tt_service_gx_multi_masters; |
#endif |
- FT_Service_TTGlyfRec tt_service_truetype_glyf; |
+ FT_Service_TTGlyfRec tt_service_truetype_glyf; |
+ FT_Service_PropertiesRec tt_service_properties; |
+ |
} TTModulePIC; |
-#define GET_PIC(lib) ((TTModulePIC*)((lib)->pic_container.truetype)) |
-#define FT_TT_SERVICES_GET (GET_PIC(library)->tt_services) |
-#define FT_TT_SERVICE_GX_MULTI_MASTERS_GET (GET_PIC(library)->tt_service_gx_multi_masters) |
-#define FT_TT_SERVICE_TRUETYPE_GLYF_GET (GET_PIC(library)->tt_service_truetype_glyf) |
+ |
+#define GET_PIC( lib ) \ |
+ ( (TTModulePIC*)((lib)->pic_container.truetype) ) |
+#define TT_SERVICES_GET \ |
+ ( GET_PIC( library )->tt_services ) |
+#define TT_SERVICE_GX_MULTI_MASTERS_GET \ |
+ ( GET_PIC( library )->tt_service_gx_multi_masters ) |
+#define TT_SERVICE_TRUETYPE_GLYF_GET \ |
+ ( GET_PIC( library )->tt_service_truetype_glyf ) |
+#define TT_SERVICE_PROPERTIES_GET \ |
+ ( GET_PIC( library )->tt_service_properties ) |
+ |
/* see ttpic.c for the implementation */ |
void |
@@ -58,6 +72,7 @@ FT_BEGIN_HEADER |
/* */ |
+ |
FT_END_HEADER |
#endif /* __TTPIC_H__ */ |