Commit 633a729d384e751031332ba2aab8221b51e29dd4
2015-02-21T07:02:01
[cff] Minor signedness fixes related to last commit. * src/cff/cf2ft.c, src/cff/cf2intrp.c, src/cff/cffgload.c: Apply.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
diff --git a/ChangeLog b/ChangeLog
index d5436be..94e69b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-21 Werner Lemberg <wl@gnu.org>
+
+ [cff] Minor signedness fixes related to last commit.
+
+ * src/cff/cf2ft.c, src/cff/cf2intrp.c, src/cff/cffgload.c: Apply.
+
2015-02-20 Werner Lemberg <wl@gnu.org>
[cff] Thinkos in bias handling.
diff --git a/src/cff/cf2ft.c b/src/cff/cf2ft.c
index 2c91394..2bb646e 100644
--- a/src/cff/cf2ft.c
+++ b/src/cff/cf2ft.c
@@ -551,7 +551,7 @@
FT_ZERO( buf );
- idx += decoder->globals_bias;
+ idx += (CF2_UInt)decoder->globals_bias;
if ( idx >= decoder->num_globals )
return TRUE; /* error */
@@ -626,7 +626,7 @@
FT_ZERO( buf );
- idx += decoder->locals_bias;
+ idx += (CF2_UInt)decoder->locals_bias;
if ( idx >= decoder->num_locals )
return TRUE; /* error */
diff --git a/src/cff/cf2intrp.c b/src/cff/cf2intrp.c
index 462c5e7..fc8fc18 100644
--- a/src/cff/cf2intrp.c
+++ b/src/cff/cf2intrp.c
@@ -770,7 +770,8 @@
switch ( op1 )
{
case cf2_cmdCALLGSUBR:
- FT_TRACE4(( "(%d)\n", subrIndex + decoder->globals_bias ));
+ FT_TRACE4(( "(%d)\n",
+ subrIndex + (CF2_UInt)decoder->globals_bias ));
if ( cf2_initGlobalRegionBuffer( decoder,
subrIndex,
@@ -783,7 +784,8 @@
default:
/* cf2_cmdCALLSUBR */
- FT_TRACE4(( "(%d)\n", subrIndex + decoder->locals_bias ));
+ FT_TRACE4(( "(%d)\n",
+ subrIndex + (CF2_UInt)decoder->locals_bias ));
if ( cf2_initLocalRegionBuffer( decoder,
subrIndex,
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index b20ad50..414790a 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -341,7 +341,7 @@
cff_compute_bias( FT_Int in_charstring_type,
FT_UInt num_subrs )
{
- FT_UInt result;
+ FT_Int result;
if ( in_charstring_type == 1 )