diff options
| author | Werner Lemberg <wl@gnu.org> | 2014-10-23 19:57:37 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2014-10-23 19:57:37 +0200 |
| commit | dd570e99ab6770657222bf7da8f780b8ea9752a1 (patch) | |
| tree | 719d67c958096c1507ae9666273641c8eb367daa /devel | |
| parent | cc7bb80bdea0fe0f60f6f01e3c0a054fa100bd48 (diff) | |
| download | freetype2-dd570e99ab6770657222bf7da8f780b8ea9752a1.tar.gz | |
[cff] Work around bug in preprocessor of MSVC 2010.
We have been hit by
https://connect.microsoft.com/VisualStudio/feedback/details/718976/msvc-pr
* devel/ftoption.h, include/config/ftoption.h: Replace
`CFF_CONFIG_OPTION_DARKENING_PARAMETERS' with eight macros
`CFF_CONFIG_OPTION_DARKENING_PARAMETER_{X,Y}{1,2,3,4}'.
* src/cff/cffobjs.c (SET_DARKENING_PARAMETERS): Removed. We no
longer need double expansion.
(SET_DARKENING_PARAMETERS_0): Renamed to ...
(SET_DARKENING_PARAMETERS): ... this.
Update call.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/ftoption.h | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/devel/ftoption.h b/devel/ftoption.h index 97f9cc23a..c3d6df37a 100644 --- a/devel/ftoption.h +++ b/devel/ftoption.h @@ -773,19 +773,26 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ - /* Using CFF_CONFIG_OPTION_DARKENING_PARAMETERS it is possible to set up */ - /* the default values of the four control points that define the stem */ - /* darkening behaviour of the (new) CFF engine. For more details please */ - /* read the documentation of the `darkening-parameters' property of the */ - /* cff driver module (file `ftcffdrv.h'), which allows the control at */ - /* run-time. */ - /* */ - /* Do *not* undefine this macro! */ - /* */ -#define CFF_CONFIG_OPTION_DARKENING_PARAMETERS 500, 400, \ - 1000, 275, \ - 1667, 275, \ - 2333, 0 + /* Using CFF_CONFIG_OPTION_DARKENING_PARAMETER_{X,Y}{1,2,3,4} it is */ + /* possible to set up the default values of the four control points that */ + /* define the stem darkening behaviour of the (new) CFF engine. For */ + /* more details please read the documentation of the */ + /* `darkening-parameters' property of the cff driver module (file */ + /* `ftcffdrv.h'), which allows the control at run-time. */ + /* */ + /* Do *not* undefine these macros! */ + /* */ +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X1 500 +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y1 400 + +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X2 1000 +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y2 275 + +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X3 1667 +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y3 275 + +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4 2333 +#define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4 0 /*************************************************************************/ |