diff options
| author | Ewald Hew <ewaldhew@gmail.com> | 2017-09-24 22:20:38 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2017-09-25 09:26:59 +0200 |
| commit | edacde60e3974371dbab156c2d2b06b3f000e4b2 (patch) | |
| tree | f4e45ebe6319daf325e69728fbe21be2e668d93d /src/cff/cffobjs.c | |
| parent | 9578e07a83a8cb12fba360948b264796ec607f83 (diff) | |
| download | freetype2-edacde60e3974371dbab156c2d2b06b3f000e4b2.tar.gz | |
Add new service for inter-module calls.
NOTE: Does not compile!
This is to allow CFF functions moved to `psaux' to call functions
declared in `src/cff/cffload.h'.
* include/freetype/internal/services/svcfftl.h: New file, setting up
a `CFFLoad' service.
* include/freetype/internal/ftserv.h (FT_DEFINE_SERVICEDESCREC10,
FT_DEFINE_SERVICEDESCREC): New macros.
(FT_SERVICE_CFF_TABLE_LOAD_H): New macro.
* src/cff/cffdrivr.c, src/cff/cffpic.h: Register the new service.
* src/cff/cfftypes.h (CFF_FontRec), src/psaux/cf2font.h
(CF2_FontRec): Add service interface.
* src/cff/cffobjs.c, src/psaux/cf2font.c, src/psaux/cf2ft.c,
src/psaux/cf2intrp.c, src/psaux/cffdecode.c: Use the new service.
Diffstat (limited to 'src/cff/cffobjs.c')
| -rw-r--r-- | src/cff/cffobjs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c index b0d275c73..ed154664f 100644 --- a/src/cff/cffobjs.c +++ b/src/cff/cffobjs.c @@ -496,6 +496,7 @@ FT_Service_PsCMaps psnames; PSHinter_Service pshinter; PSAux_Service psaux; + FT_Service_CFFLoad cffload; FT_Bool pure_cff = 1; FT_Bool cff2 = 0; FT_Bool sfnt_format = 0; @@ -526,6 +527,8 @@ } face->psaux = psaux; + FT_FACE_FIND_GLOBAL_SERVICE( face, cffload, CFF_LOAD ); + FT_TRACE2(( "CFF driver\n" )); /* create input stream from resource */ @@ -627,6 +630,7 @@ cff->pshinter = pshinter; cff->psnames = psnames; + cff->cffload = cffload; cffface->face_index = face_index & 0xFFFF; |