ref: 633a729d384e751031332ba2aab8221b51e29dd4
parent: c00b05f2028a91bf41fe7f33c3254ecad81a5d58
author: Werner Lemberg <[email protected]>
date: Sat Feb 21 02:02:01 EST 2015
[cff] Minor signedness fixes related to last commit. * src/cff/cf2ft.c, src/cff/cf2intrp.c, src/cff/cffgload.c: Apply.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-21 Werner Lemberg <[email protected]>
+
+ [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 <[email protected]>
[cff] Thinkos in bias handling.
--- 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 */
--- 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,
--- 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 )