rev |
line source |
al@19306
|
1 --- a/modules.cfg
|
al@19306
|
2 +++ b/modules.cfg
|
al@19306
|
3 @@ -110,7 +110,7 @@ RASTER_MODULES += smooth
|
al@19306
|
4 AUX_MODULES += cache
|
al@19306
|
5
|
al@19306
|
6 # TrueType GX/AAT table validation. Needs ftgxval.c below.
|
al@19306
|
7 -# AUX_MODULES += gxvalid
|
al@19306
|
8 +AUX_MODULES += gxvalid
|
al@19306
|
9
|
al@19306
|
10 # Support for streams compressed with gzip (files with suffix .gz).
|
al@19306
|
11 #
|
al@19306
|
12 @@ -129,7 +129,7 @@ AUX_MODULES += bzip2
|
al@19306
|
13
|
al@19306
|
14 # OpenType table validation. Needs ftotval.c below.
|
al@19306
|
15 #
|
al@19306
|
16 -# AUX_MODULES += otvalid
|
al@19306
|
17 +AUX_MODULES += otvalid
|
al@19306
|
18
|
al@19306
|
19 # Auxiliary PostScript driver component to share common code.
|
al@19306
|
20 #
|
al@19306
|
21 --- a/include/freetype/config/ftoption.h
|
al@19306
|
22 +++ b/include/freetype/config/ftoption.h
|
al@19306
|
23 @@ -92,7 +92,7 @@ FT_BEGIN_HEADER
|
al@19306
|
24 /* This is done to allow FreeType clients to run unmodified, forcing */
|
al@19306
|
25 /* them to display normal gray-level anti-aliased glyphs. */
|
al@19306
|
26 /* */
|
al@19306
|
27 -/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
|
al@19306
|
28 +#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
|
al@19306
|
29
|
al@19306
|
30
|
al@19306
|
31 /*************************************************************************/
|
al@19306
|
32 --- a/include/freetype/config/ftoption.h
|
al@19306
|
33 +++ b/include/freetype/config/ftoption.h
|
al@19306
|
34 @@ -631,8 +631,8 @@ FT_BEGIN_HEADER
|
al@19306
|
35 /* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
|
al@19306
|
36 /* */
|
al@19306
|
37 /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
|
al@19306
|
38 -#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
|
al@19306
|
39 -/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */
|
al@19306
|
40 +/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
|
al@19306
|
41 +#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
|
al@19306
|
42
|
al@19306
|
43
|
al@19306
|
44 /*************************************************************************/
|
al@19306
|
45 --- a/src/truetype/ttobjs.c
|
al@19306
|
46 +++ b/src/truetype/ttobjs.c
|
al@19306
|
47 @@ -36,6 +36,9 @@
|
al@19306
|
48 #include "ttgxvar.h"
|
al@19306
|
49 #endif
|
al@19306
|
50
|
al@19306
|
51 +#include <stdlib.h>
|
al@19306
|
52 +#include <errno.h>
|
al@19306
|
53 +
|
al@19306
|
54 /*************************************************************************/
|
al@19306
|
55 /* */
|
al@19306
|
56 /* The macro FT_COMPONENT is used in trace mode. It is an implicit */
|
al@19306
|
57 @@ -1286,6 +1289,7 @@
|
al@19306
|
58 #ifdef TT_USE_BYTECODE_INTERPRETER
|
al@19306
|
59
|
al@19306
|
60 TT_Driver driver = (TT_Driver)ttdriver;
|
al@19306
|
61 + const char *envval;
|
al@19306
|
62
|
al@19306
|
63 driver->interpreter_version = TT_INTERPRETER_VERSION_35;
|
al@19306
|
64 #ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
|
al@19306
|
65 @@ -1295,6 +1299,39 @@
|
al@19306
|
66 driver->interpreter_version = TT_INTERPRETER_VERSION_40;
|
al@19306
|
67 #endif
|
al@19306
|
68
|
al@19306
|
69 + errno = 0;
|
al@19306
|
70 + envval = getenv( "FT2_SUBPIXEL_HINTING" );
|
al@19306
|
71 + if ( envval )
|
al@19306
|
72 + {
|
al@19306
|
73 + char *endptr = NULL;
|
al@19306
|
74 + unsigned long value = strtoul( envval, &endptr, 10 );
|
al@19306
|
75 +
|
al@19306
|
76 + if ( !errno && endptr && !*endptr )
|
al@19306
|
77 + {
|
al@19306
|
78 + switch( value )
|
al@19306
|
79 + {
|
al@19306
|
80 + case 0:
|
al@19306
|
81 + driver->interpreter_version = TT_INTERPRETER_VERSION_35;
|
al@19306
|
82 + break;
|
al@19306
|
83 +
|
al@19306
|
84 +#ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY
|
al@19306
|
85 + case 1:
|
al@19306
|
86 + driver->interpreter_version = TT_INTERPRETER_VERSION_38;
|
al@19306
|
87 + break;
|
al@19306
|
88 +#endif
|
al@19306
|
89 +
|
al@19306
|
90 +#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
|
al@19306
|
91 + case 2:
|
al@19306
|
92 + driver->interpreter_version = TT_INTERPRETER_VERSION_40;
|
al@19306
|
93 + break;
|
al@19306
|
94 +#endif
|
al@19306
|
95 +
|
al@19306
|
96 + default:
|
al@19306
|
97 + break;
|
al@19306
|
98 + }
|
al@19306
|
99 + }
|
al@19306
|
100 + }
|
al@19306
|
101 +
|
al@19306
|
102 #else /* !TT_USE_BYTECODE_INTERPRETER */
|
al@19306
|
103
|
al@19306
|
104 FT_UNUSED( ttdriver );
|