psaux: Fix a few casts to FT_Int32 value.

This commit is contained in:
suzuki toshiya 2009-08-01 00:37:58 +09:00
parent b76c3f718d
commit e6d0c1fb9c
2 changed files with 11 additions and 3 deletions

View File

@ -1,3 +1,11 @@
2009-07-31 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
psaux: Fix a few casts to FT_Int32 value.
* src/psaux/t1decode.c (t1_decoder_parse_charstrings):
Fix a few casts setting `value' from FT_Long to FT_Int32,
because `value' is typed as FT_Int32 since 2009-06-22.
2009-07-31 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> 2009-07-31 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
sfnt: Fix a data type mismatching with its source. sfnt: Fix a data type mismatching with its source.

View File

@ -594,7 +594,7 @@
if ( ip[-1] >= 32 ) if ( ip[-1] >= 32 )
{ {
if ( ip[-1] < 247 ) if ( ip[-1] < 247 )
value = (FT_Long)ip[-1] - 139; value = (FT_Int32)ip[-1] - 139;
else else
{ {
if ( ++ip > limit ) if ( ++ip > limit )
@ -605,9 +605,9 @@
} }
if ( ip[-2] < 251 ) if ( ip[-2] < 251 )
value = ( ( (FT_Long)ip[-2] - 247 ) << 8 ) + ip[-1] + 108; value = ( ( (FT_Int32)ip[-2] - 247 ) << 8 ) + ip[-1] + 108;
else else
value = -( ( ( (FT_Long)ip[-2] - 251 ) << 8 ) + ip[-1] + 108 ); value = -( ( ( (FT_Int32)ip[-2] - 251 ) << 8 ) + ip[-1] + 108 );
} }
if ( !large_int ) if ( !large_int )