minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

[cff] Minor signedness fixes related to last commit. 

* src/cff/cf2ft.c, src/cff/cf2intrp.c, src/cff/cffgload.c: Apply.
This commit is contained in:
Werner Lemberg 2015-02-21 07:02:01 +01:00
parent c00b05f202
commit 633a729d38
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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.

4
src/cff/cf2ft.c
View File

@ -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 */

6
src/cff/cf2intrp.c
View File

@ -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,

2
src/cff/cffgload.c
View File

@ -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 )