diff options
| author | Ewald Hew <ewaldhew@gmail.com> | 2017-07-21 20:52:34 +0800 |
|---|---|---|
| committer | Ewald Hew <ewaldhew@gmail.com> | 2017-08-28 08:29:07 +0800 |
| commit | aa6121a3acb68c45360e9ad929dd41d3d88f74f3 (patch) | |
| tree | 957bef8e1c7becf8d9011180702c171f022c5ae5 /include | |
| parent | f1976a37f4cf555e1af7dd0f5a460bd4df2f64c3 (diff) | |
| download | freetype2-aa6121a3acb68c45360e9ad929dd41d3d88f74f3.tar.gz | |
[cff] Move and rename CFF_Driver
This is so that we can use the same hinting engine parameters for Type 1.
* include/freetype/internal/cffotypes.h (CFF_Driver): Renamed to PS_Driver...
* include/freetype/internal/psaux.h: ...and moved to here.
* src/cff/cffdrivr.c, src/cff/cffgload.c, src/cff/cffload.c, src/cff/cffobjs.c,
src/cff/cffobjs.h, src/psaux/psft.c, src/psaux/psobjs.c: Updated references.
Diffstat (limited to 'include')
| -rw-r--r-- | include/freetype/internal/cffotypes.h | 26 | ||||
| -rw-r--r-- | include/freetype/internal/psaux.h | 16 |
2 files changed, 16 insertions, 26 deletions
diff --git a/include/freetype/internal/cffotypes.h b/include/freetype/internal/cffotypes.h index 6cabaff17..32f7d32ad 100644 --- a/include/freetype/internal/cffotypes.h +++ b/include/freetype/internal/cffotypes.h @@ -12,16 +12,6 @@ FT_BEGIN_HEADER - /*************************************************************************/ - /* */ - /* <Type> */ - /* CFF_Driver */ - /* */ - /* <Description> */ - /* A handle to an OpenType driver object. */ - /* */ - typedef struct CFF_DriverRec_* CFF_Driver; - typedef TT_Face CFF_Face; @@ -91,22 +81,6 @@ FT_BEGIN_HEADER } CFF_Transform; - /***********************************************************************/ - /* */ - /* CFF driver class. */ - /* */ - typedef struct CFF_DriverRec_ - { - FT_DriverRec root; - - FT_UInt hinting_engine; - FT_Bool no_stem_darkening; - FT_Int darken_params[8]; - FT_Int32 random_seed; - - } CFF_DriverRec; - - FT_END_HEADER diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h index bde0bfac2..24c02e779 100644 --- a/include/freetype/internal/psaux.h +++ b/include/freetype/internal/psaux.h @@ -35,6 +35,22 @@ FT_BEGIN_HEADER + /***********************************************************************/ + /* */ + /* PostScript modules driver class. */ + /* */ + typedef struct PS_DriverRec_ + { + FT_DriverRec root; + + FT_UInt hinting_engine; + FT_Bool no_stem_darkening; + FT_Int darken_params[8]; + FT_Int32 random_seed; + + } PS_DriverRec, *PS_Driver; + + /*************************************************************************/ /*************************************************************************/ /***** *****/ |