diff options
| author | Alexei Podtelezhnikov <apodtele@gmail.com> | 2018-04-28 22:58:51 -0400 |
|---|---|---|
| committer | Alexei Podtelezhnikov <apodtele@gmail.com> | 2018-04-28 22:58:51 -0400 |
| commit | b5a29cce2ff81376ce4d4c77beff1cefeca3e206 (patch) | |
| tree | 7338d04ae99725a8255bdb21a7304a9b859fb798 /src/cid/cidriver.c | |
| parent | 66006dbfa4b45b6d5d1ae3ff7eaa49f7a2d40729 (diff) | |
| parent | ac97a29653e2a551064705891bc578c53ecf056d (diff) | |
| download | freetype2-b5a29cce2ff81376ce4d4c77beff1cefeca3e206.tar.gz | |
Merge branch 'master' into Harmony
Diffstat (limited to 'src/cid/cidriver.c')
| -rw-r--r-- | src/cid/cidriver.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c index bb611a961..d9faf353e 100644 --- a/src/cid/cidriver.c +++ b/src/cid/cidriver.c @@ -4,7 +4,7 @@ /* */ /* CID driver interface (body). */ /* */ -/* Copyright 1996-2017 by */ +/* Copyright 1996-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -20,6 +20,7 @@ #include "cidriver.h" #include "cidgload.h" #include FT_INTERNAL_DEBUG_H +#include FT_INTERNAL_POSTSCRIPT_PROPS_H #include "ciderrs.h" @@ -27,6 +28,10 @@ #include FT_SERVICE_FONT_FORMAT_H #include FT_SERVICE_POSTSCRIPT_INFO_H #include FT_SERVICE_CID_H +#include FT_SERVICE_PROPERTIES_H +#include FT_DRIVER_H + +#include FT_INTERNAL_POSTSCRIPT_AUX_H /*************************************************************************/ @@ -168,6 +173,18 @@ /* + * PROPERTY SERVICE + * + */ + + FT_DEFINE_SERVICE_PROPERTIESREC( + cid_service_properties, + + (FT_Properties_SetFunc)ps_property_set, /* set_property */ + (FT_Properties_GetFunc)ps_property_get ) /* get_property */ + + + /* * SERVICE LIST * */ @@ -178,6 +195,7 @@ { FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &cid_service_ps_name }, { FT_SERVICE_ID_POSTSCRIPT_INFO, &cid_service_ps_info }, { FT_SERVICE_ID_CID, &cid_service_cid_info }, + { FT_SERVICE_ID_PROPERTIES, &cid_service_properties }, { NULL, NULL } }; @@ -200,7 +218,7 @@ FT_MODULE_FONT_DRIVER | FT_MODULE_DRIVER_SCALABLE | FT_MODULE_DRIVER_HAS_HINTER, - sizeof ( FT_DriverRec ), + sizeof ( PS_DriverRec ), "t1cid", /* module name */ 0x10000L, /* version 1.0 of driver */ |