diff options
| author | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2009-07-03 18:01:43 +0900 |
|---|---|---|
| committer | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2009-07-03 18:01:43 +0900 |
| commit | 988838f9d855acb44565531e191041fcf70de262 (patch) | |
| tree | 3695254140baf37d63304bee6e80622e7e6b8885 | |
| parent | 8224bd671b8d5d43a47296a5761aa2fe185551f9 (diff) | |
| download | freetype2-988838f9d855acb44565531e191041fcf70de262.tar.gz | |
psaux: Fix a few casts to FT_Int32 value.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/psaux/t1decode.c | 6 |
2 files changed, 11 insertions, 3 deletions
@@ -1,5 +1,13 @@ 2009-07-03 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-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> + sfnt: Fix a data type mismatching with its source. * src/sfnt/ttcmap.c (tt_cmap13_char_next): Fix the 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 ) |