Commit af9b8c9d authored by Werner Lemberg's avatar Werner Lemberg
Browse files

* src/truetype/ttobjs.c (TT_Init_Size): Fix #ifdef's to work with

disabled interpreter also.

* src/base/ftnames.c (FT_Get_Sfnt_Name_Count): Fix incorrect
parentheses.
parent f2b2e249
2000-11-28 YAMANO-UCHI Hidetoshi <mer@din.or.jp>
* src/truetype/ttobjs.c (TT_Init_Size): Fix #ifdef's to work with
disabled interpreter also.
* src/base/ftnames.c (FT_Get_Sfnt_Name_Count): Fix incorrect
parentheses.
2000-11-26 Tom Kacvinsky <tjk@ams.org> 2000-11-26 Tom Kacvinsky <tjk@ams.org>
* src/cff/t2gload.c (T2_Parse_CharStrings): Added logic to glyph * src/cff/t2gload.c (T2_Parse_CharStrings): Added logic to glyph
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
FT_EXPORT_DEF( FT_UInt ) FT_Get_Sfnt_Name_Count( FT_Face face ) FT_EXPORT_DEF( FT_UInt ) FT_Get_Sfnt_Name_Count( FT_Face face )
{ {
return face && ( FT_IS_SFNT( face ) ? ((TT_Face)face)->num_names : 0 ); return (face && FT_IS_SFNT( face )) ? ((TT_Face)face)->num_names : 0;
} }
......
...@@ -453,8 +453,7 @@ ...@@ -453,8 +453,7 @@
size->ttmetrics.valid = FALSE; size->ttmetrics.valid = FALSE;
return error; return error;
#if defined( TT_CONFIG_OPTION_BYTECODE_INTERPRETER ) || \ #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
defined( TT_CONFIG_OPTION_EMBEDDED_BITMAPS )
Fail_Exec: Fail_Exec:
if ( !size->debug ) if ( !size->debug )
...@@ -585,13 +584,13 @@ ...@@ -585,13 +584,13 @@
metrics->max_advance = ( FT_MulFix( face->root.max_advance_width, metrics->max_advance = ( FT_MulFix( face->root.max_advance_width,
metrics->x_scale ) + 32 ) & -64; metrics->x_scale ) + 32 ) & -64;
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
/* set to `invalid' by default */ /* set to `invalid' by default */
size->strike_index = 0xFFFF; size->strike_index = 0xFFFF;
#endif #endif
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
{ {
TT_ExecContext exec; TT_ExecContext exec;
FT_UInt i, j; FT_UInt i, j;
...@@ -795,16 +794,11 @@ ...@@ -795,16 +794,11 @@
if ( face->face_flags & FT_FACE_FLAG_FIXED_SIZES ) if ( face->face_flags & FT_FACE_FLAG_FIXED_SIZES )
{ {
FT_Size_Metrics* sbit_metrics;
if ( size->strike_index == 0xFFFF ) if ( size->strike_index == 0xFFFF )
error = Reset_SBit_Size( size ); error = Reset_SBit_Size( size );
sbit_metrics = &size->strike_metrics;
if ( !error && !( face->face_flags & FT_FACE_FLAG_SCALABLE ) ) if ( !error && !( face->face_flags & FT_FACE_FLAG_SCALABLE ) )
size->root.metrics = *sbit_metrics; size->root.metrics = size->strike_metrics;
} }
#endif /* TT_CONFIG_OPTION_EMBEDDED_BITMAPS */ #endif /* TT_CONFIG_OPTION_EMBEDDED_BITMAPS */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment