From 633a729d384e751031332ba2aab8221b51e29dd4 Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Sat, 21 Feb 2015 07:02:01 +0100
Subject: [PATCH] [cff] Minor signedness fixes related to last commit.

* src/cff/cf2ft.c, src/cff/cf2intrp.c, src/cff/cffgload.c: Apply.
---
 ChangeLog          | 6 ++++++
 src/cff/cf2ft.c    | 4 ++--
 src/cff/cf2intrp.c | 6 ++++--
 src/cff/cffgload.c | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d5436bed5..94e69b7f5 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 2c913943f..2bb646ead 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 462c5e7e7..fc8fc18a8 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 b20ad5070..414790aec 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 )