diff options
| author | Werner Lemberg <wl@gnu.org> | 2017-12-08 18:38:41 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2017-12-08 18:41:49 +0100 |
| commit | 98ba0c4a37cc8223b513efb4f2a5df4f25ec0756 (patch) | |
| tree | 82f815737fb4351c5672795e22e1f8874a14e59f /src/cid/cidriver.c | |
| parent | bef8de2a85616b7b7e90a712189a6f133a4c1b7b (diff) | |
| download | freetype2-98ba0c4a37cc8223b513efb4f2a5df4f25ec0756.tar.gz | |
New `ftdriver.h' file, covering all driver modules.
This reduces redundancy and increases synergy; it also reduces the
number of header files.
* include/freetype/config/ftheader.h (FT_DRIVER_H): New macro.
(FT_AUTOHINTER_H, FT_CFF_DRIVER_H, FT_TRUETYPE_DRIVER_H,
FT_PCF_DRIVER_H, FT_TYPE1_DRIVER_H): Make them aliases to
FT_DRIVER_H.
* include/freetype/ftautoh.h, include/freetype/ftcffdrv.h,
include/freetype/ftpcfdrv.h, include/freetype/ftt1drv.h,
include/freetype/ftttdrv.h: Replaced with...
* include/freetype/ftdriver.h: ...this new file.
(FT_CFF_HINTING_ADOBE, FT_T1_HINTING_ADOBE): Renamed to...
(FT_HINTING_ADOBE): ... this new macro.
(FT_CFF_HINTING_FREETYPE, FT_T1_HINTING_FREETYPE): Renamed to...
(FT_HINTING_FREETYPE): ... this new macro.
* src/*/*: Updated accordingly.
Diffstat (limited to 'src/cid/cidriver.c')
| -rw-r--r-- | src/cid/cidriver.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c index 94bf858d3..485e1247c 100644 --- a/src/cid/cidriver.c +++ b/src/cid/cidriver.c @@ -28,7 +28,7 @@ #include FT_SERVICE_POSTSCRIPT_INFO_H #include FT_SERVICE_CID_H #include FT_SERVICE_PROPERTIES_H -#include FT_TYPE1_DRIVER_H +#include FT_DRIVER_H #include FT_INTERNAL_POSTSCRIPT_AUX_H @@ -260,10 +260,10 @@ if ( !ft_strcmp( s, "adobe" ) ) - driver->hinting_engine = FT_T1_HINTING_ADOBE; + driver->hinting_engine = FT_HINTING_ADOBE; #ifdef T1_CONFIG_OPTION_OLD_ENGINE else if ( !ft_strcmp( s, "freetype" ) ) - driver->hinting_engine = FT_T1_HINTING_FREETYPE; + driver->hinting_engine = FT_HINTING_FREETYPE; #endif else return FT_THROW( Invalid_Argument ); @@ -274,9 +274,9 @@ FT_UInt* hinting_engine = (FT_UInt*)value; - if ( *hinting_engine == FT_T1_HINTING_ADOBE + if ( *hinting_engine == FT_HINTING_ADOBE #ifdef T1_CONFIG_OPTION_OLD_ENGINE - || *hinting_engine == FT_T1_HINTING_FREETYPE + || *hinting_engine == FT_HINTING_FREETYPE #endif ) driver->hinting_engine = *hinting_engine; |