diff options
| author | Werner Lemberg <wl@gnu.org> | 2017-03-17 21:47:54 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2017-03-17 21:47:54 +0100 |
| commit | d5bfa053f5854cc42966634e1b26a8024b7a51d4 (patch) | |
| tree | 3c3db47384ef7ee6b172d25d0bfeae287e388d96 /src/sfnt/sfobjs.c | |
| parent | e5595784f4075a631f3d6606cecc6dad3100d642 (diff) | |
| download | freetype2-d5bfa053f5854cc42966634e1b26a8024b7a51d4.tar.gz | |
Fixes for conditional compilation.
* src/autofit/afcjk.c, src/autofit/afindic.c: Include `afcjk.h'
earlier.
* src/sfnt/sfobjs.c (sfnt_init_face): Put `memory' variable into
TT_CONFIG_OPTION_GX_VAR_SUPPORT block.
(sfnt_done_face): Protect some code with
TT_CONFIG_OPTION_GX_VAR_SUPPORT.
* src/sfnt/ttsbit.c (tt_face_load_sbix_image): Remove compiler
warning.
* src/truetype/ttgload.c (TT_Load_Simple_Glyph): Put `tmp' variable
into TT_USE_BYTECODE_INTERPRETER block.
(tt_loader_init): Put `error' variable into
TT_USE_BYTECODE_INTERPRETER block.
Diffstat (limited to 'src/sfnt/sfobjs.c')
| -rw-r--r-- | src/sfnt/sfobjs.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c index 36400749a..0418d83ca 100644 --- a/src/sfnt/sfobjs.c +++ b/src/sfnt/sfobjs.c @@ -856,7 +856,6 @@ FT_Parameter* params ) { FT_Error error; - FT_Memory memory = face->root.memory; FT_Library library = face->root.driver->root.library; SFNT_Service sfnt; FT_Int face_index; @@ -943,6 +942,8 @@ #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT { + FT_Memory memory = face->root.memory; + FT_ULong fvar_len; FT_ULong version; @@ -1754,8 +1755,10 @@ FT_FREE( face->sbit_strike_map ); face->root.num_fixed_sizes = 0; +#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT FT_FREE( face->postscript_name ); FT_FREE( face->var_postscript_prefix ); +#endif face->sfnt = NULL; } |