diff options
-rw-r--r-- | src/autofit/afmodule.c | 2 | ||||
-rw-r--r-- | src/autofit/afpic.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/autofit/afmodule.c b/src/autofit/afmodule.c index ec2d707c9..10717b554 100644 --- a/src/autofit/afmodule.c +++ b/src/autofit/afmodule.c @@ -83,7 +83,7 @@ 0x10000L, /* version 1.0 of the autofitter */ 0x20000L, /* requires FreeType 2.0 or above */ - (const void*)&AF_AF_AUTOFITTER_SERVICE_GET, + (const void*)&AF_AUTOFITTER_SERVICE_GET, (FT_Module_Constructor)af_autofitter_init, (FT_Module_Destructor) af_autofitter_done, diff --git a/src/autofit/afpic.h b/src/autofit/afpic.h index a1720bf9f..e61fa28fd 100644 --- a/src/autofit/afpic.h +++ b/src/autofit/afpic.h @@ -25,8 +25,8 @@ FT_BEGIN_HEADER #ifndef FT_CONFIG_OPTION_PIC -# define AF_SCRIPT_CLASSES_GET af_script_classes -# define AF_AF_AUTOFITTER_SERVICE_GET af_autofitter_service +# define AF_SCRIPT_CLASSES_GET af_script_classes +# define AF_AUTOFITTER_SERVICE_GET af_autofitter_service #else /* FT_CONFIG_OPTION_PIC */ @@ -47,9 +47,9 @@ FT_BEGIN_HEADER FT_AutoHinter_ServiceRec af_autofitter_service; } AFModulePIC; -#define GET_PIC(lib) ((AFModulePIC*)((lib)->pic_table.autofit->data)) -#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_GET_PIC(lib) ((AFModulePIC*)FT_LIBRARY_GET_PIC_DATA(lib,autofit)) +#define AF_SCRIPT_CLASSES_GET (AF_GET_PIC(FT_FACE_LIBRARY(globals->face))->af_script_classes) +#define AF_AUTOFITTER_SERVICE_GET (AF_GET_PIC(library)->af_autofitter_service) #endif /* FT_CONFIG_OPTION_PIC */ |