diff options
| author | Ewald Hew <ewaldhew@gmail.com> | 2017-07-24 12:06:46 +0800 |
|---|---|---|
| committer | Ewald Hew <ewaldhew@gmail.com> | 2017-08-21 14:17:43 +0800 |
| commit | dfb689cb0ab22249790494740fa5874f255afcd8 (patch) | |
| tree | 54e8837ef0a89ccc21ec27c27d055f7b9d47fb93 | |
| parent | 76e9d80adcf6d0e902cde6127b41835ceada8f34 (diff) | |
| download | freetype2-dfb689cb0ab22249790494740fa5874f255afcd8.tar.gz | |
[cid] Add Adobe engine config.
This is similar to what was done in the type1 module.
* src/cid/cidriver.c: Update declaration.
* src/cid/cidobjs.c (cid_driver_init): Added.
| -rw-r--r-- | src/cid/cidobjs.c | 34 | ||||
| -rw-r--r-- | src/cid/cidriver.c | 2 |
2 files changed, 33 insertions, 3 deletions
diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c index ceda8ff97..52c6438f9 100644 --- a/src/cid/cidobjs.c +++ b/src/cid/cidobjs.c @@ -26,6 +26,7 @@ #include FT_SERVICE_POSTSCRIPT_CMAPS_H #include FT_INTERNAL_POSTSCRIPT_AUX_H #include FT_INTERNAL_POSTSCRIPT_HINTS_H +#include FT_TYPE1_DRIVER_H #include "ciderrs.h" @@ -463,9 +464,38 @@ /* FreeType error code. 0 means success. */ /* */ FT_LOCAL_DEF( FT_Error ) - cid_driver_init( FT_Module driver ) + cid_driver_init( FT_Module module ) { - FT_UNUSED( driver ); + PS_Driver driver = (PS_Driver)module; + + FT_UInt32 seed; + + + /* set default property values, cf. `ftcffdrv.h' */ + driver->hinting_engine = FT_T1_HINTING_ADOBE; + + driver->no_stem_darkening = TRUE; + + driver->darken_params[0] = CFF_CONFIG_OPTION_DARKENING_PARAMETER_X1; + driver->darken_params[1] = CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y1; + driver->darken_params[2] = CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2; + driver->darken_params[3] = CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y2; + driver->darken_params[4] = CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3; + driver->darken_params[5] = CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y3; + driver->darken_params[6] = CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4; + driver->darken_params[7] = CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4; + + /* compute random seed from some memory addresses */ + seed = (FT_UInt32)( (FT_Offset)(char*)&seed ^ + (FT_Offset)(char*)&module ^ + (FT_Offset)(char*)module->memory ); + seed = seed ^ ( seed >> 10 ) ^ ( seed >> 20 ); + + driver->random_seed = (FT_Int32)seed; + if ( driver->random_seed < 0 ) + driver->random_seed = -driver->random_seed; + else if ( driver->random_seed == 0 ) + driver->random_seed = 123456789; return FT_Err_Ok; } diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c index bb611a961..c7d42f939 100644 --- a/src/cid/cidriver.c +++ b/src/cid/cidriver.c @@ -200,7 +200,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 */ |