Index: src/autofit/afpic.h |
diff --git a/src/autofit/afpic.h b/src/autofit/afpic.h |
index 21b0ff988c2dfaede5f51cb382032e99a8004387..0acf803894cf094aa7dfb638f5a8222be35da0b1 100644 |
--- a/src/autofit/afpic.h |
+++ b/src/autofit/afpic.h |
@@ -4,7 +4,7 @@ |
/* */ |
/* The FreeType position independent code services for autofit module. */ |
/* */ |
-/* Copyright 2009, 2011 by */ |
+/* Copyright 2009, 2011-2012 by */ |
/* Oran Agra and Mickey Gabel. */ |
/* */ |
/* This file is part of the FreeType project, and may only be used, */ |
@@ -24,38 +24,58 @@ FT_BEGIN_HEADER |
#include FT_INTERNAL_PIC_H |
+ |
#ifndef FT_CONFIG_OPTION_PIC |
-#define AF_SCRIPT_CLASSES_GET af_script_classes |
-#define AF_AF_AUTOFITTER_SERVICE_GET af_autofitter_service |
+#define AF_SERVICES_GET af_services |
+#define AF_SERVICE_PROPERTIES_GET af_service_properties |
+ |
+#define AF_SCRIPT_CLASSES_GET af_script_classes |
+#define AF_INTERFACE_GET af_autofitter_interface |
#else /* FT_CONFIG_OPTION_PIC */ |
+ /* some include files required for members of AFModulePIC */ |
+#include FT_SERVICE_PROPERTIES_H |
+ |
#include "aftypes.h" |
/* increase these when you add new scripts, */ |
/* and update autofit_module_class_pic_init */ |
#ifdef FT_OPTION_AUTOFIT2 |
-#define AF_SCRIPT_CLASSES_COUNT 6 |
+#define AF_SCRIPT_CLASSES_COUNT 6 |
#else |
-#define AF_SCRIPT_CLASSES_COUNT 5 |
+#define AF_SCRIPT_CLASSES_COUNT 5 |
#endif |
+ |
#define AF_SCRIPT_CLASSES_REC_COUNT ( AF_SCRIPT_CLASSES_COUNT - 1 ) |
- typedef struct AFModulePIC_ |
+ |
+ typedef struct AFModulePIC_ |
{ |
- AF_ScriptClass af_script_classes[AF_SCRIPT_CLASSES_COUNT]; |
- AF_ScriptClassRec af_script_classes_rec[AF_SCRIPT_CLASSES_REC_COUNT]; |
- FT_AutoHinter_ServiceRec af_autofitter_service; |
+ FT_ServiceDescRec* af_services; |
+ FT_Service_PropertiesRec af_service_properties; |
+ |
+ AF_ScriptClass af_script_classes[AF_SCRIPT_CLASSES_COUNT]; |
+ AF_ScriptClassRec af_script_classes_rec[AF_SCRIPT_CLASSES_REC_COUNT]; |
+ FT_AutoHinter_InterfaceRec af_autofitter_interface; |
} AFModulePIC; |
-#define GET_PIC( lib ) \ |
+ |
+#define GET_PIC( lib ) \ |
( (AFModulePIC*)((lib)->pic_container.autofit) ) |
-#define AF_SCRIPT_CLASSES_GET \ |
- ( GET_PIC( FT_FACE_LIBRARY(globals->face) )->af_script_classes ) |
-#define AF_AF_AUTOFITTER_SERVICE_GET \ |
- ( GET_PIC( library )->af_autofitter_service ) |
+ |
+#define AF_SERVICES_GET \ |
+ ( GET_PIC( library )->af_services ) |
+#define AF_SERVICE_PROPERTIES_GET \ |
+ ( GET_PIC( library )->af_service_properties ) |
+ |
+#define AF_SCRIPT_CLASSES_GET \ |
+ ( GET_PIC( FT_FACE_LIBRARY( globals->face ) )->af_script_classes ) |
+#define AF_INTERFACE_GET \ |
+ ( GET_PIC( library )->af_autofitter_interface ) |
+ |
/* see afpic.c for the implementation */ |
void |