From e6d0c1fb9c0a015162f536f887e6bab7af3ac1f8 Mon Sep 17 00:00:00 2001 From: suzuki toshiya Date: Sat, 1 Aug 2009 00:37:58 +0900 Subject: [PATCH] psaux: Fix a few casts to FT_Int32 value. --- ChangeLog | 8 ++++++++ src/psaux/t1decode.c | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4cba8e938..1103f1918 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-07-31 suzuki toshiya + + 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 sfnt: Fix a data type mismatching with its source. diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c index adb0c6f20..733ad5bb7 100644 --- a/src/psaux/t1decode.c +++ b/src/psaux/t1decode.c @@ -594,7 +594,7 @@ if ( ip[-1] >= 32 ) { if ( ip[-1] < 247 ) - value = (FT_Long)ip[-1] - 139; + value = (FT_Int32)ip[-1] - 139; else { if ( ++ip > limit ) @@ -605,9 +605,9 @@ } 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 - value = -( ( ( (FT_Long)ip[-2] - 251 ) << 8 ) + ip[-1] + 108 ); + value = -( ( ( (FT_Int32)ip[-2] - 251 ) << 8 ) + ip[-1] + 108 ); } if ( !large_int )