psaux: Fix a few casts to FT_Int32 value.

16 years ago · 988838f9d8
parent 8224bd671b
commit 988838f9d8
2 changed files with 11 additions and 3 deletions
--- a/8
+++ b/8
@ -1,3 +1,11 @@
+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.
--- 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 )