diff options
| author | Infinality <infinality@infinality.net> | 2012-12-16 20:02:42 -0600 |
|---|---|---|
| committer | Infinality <infinality@infinality.net> | 2012-12-16 20:02:42 -0600 |
| commit | 461cc9365c80559e65993cfb3adfc0f832b62055 (patch) | |
| tree | 3eaf71060fd763c77c8c48ad54ddcfea4e513269 | |
| parent | 71f242c26ace99cdebecb9fdda0a580da89e3112 (diff) | |
| parent | e2fa4a6c899a4b81c2bda747195899450d5266ed (diff) | |
| download | freetype2-461cc9365c80559e65993cfb3adfc0f832b62055.tar.gz | |
Merge branch 'master' of ssh://git.sv.nongnu.org/srv/git/freetype/freetype2
Conflicts:
src/truetype/ttinterp.c
| -rw-r--r-- | src/truetype/ttinterp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index 96f62ea3a..505168d6b 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -4610,7 +4610,6 @@ FT_ULong n; TT_DefRecord* rec; TT_DefRecord* limit; - #ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING FT_Byte opcode_pattern[7][12] = { /* inline delta function 1 */ |