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

Fix compiler warnings. 

* src/psaux/psft.c (cf2_initLocalRegionBuffer): Remove redundant
test.

* src/psaux/psintrp.c (cf2_interpT2CharString)
<cf2_escCALLOTHERSUBR>: Add casts.

* src/psaux/psobjs.c (ps_decoder_init): Add cast.
This commit is contained in:
Werner Lemberg 2017-09-25 09:05:00 +02:00
parent a1a6a1f679
commit 4cdbac05b9
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2017-09-25 Werner Lemberg <wl@gnu.org>
[psaux] Fix compiler warnings.
* src/psaux/psft.c (cf2_initLocalRegionBuffer): Remove redundant
test.
* src/psaux/psintrp.c (cf2_interpT2CharString)
<cf2_escCALLOTHERSUBR>: Add casts.
* src/psaux/psobjs.c (ps_decoder_init): Add cast.
2017-09-25 Ewald Hew <ewaldhew@gmail.com>
[psaux] Minor fixes.

2
src/psaux/psft.c
View File

@ -793,7 +793,7 @@
FT_ZERO( buf );
idx = (CF2_UInt)( subrNum + decoder->locals_bias );
if ( idx < 0 || idx >= decoder->num_locals )
if ( idx >= decoder->num_locals )
return TRUE; /* error */
FT_ASSERT( decoder->locals );

8
src/psaux/psintrp.c
View File

@ -1642,9 +1642,9 @@
/* stack pointer as necessary */
count = cf2_stack_count( opStack );
FT_ASSERT( arg_cnt <= count );
FT_ASSERT( (CF2_UInt)arg_cnt <= count );
opIdx += count - arg_cnt;
opIdx += count - (CF2_UInt)arg_cnt;
known_othersubr_result_cnt = 0;
result_cnt = 0;
@ -1840,7 +1840,7 @@
cf2_stack_setReal( opStack, values++, tmp );
}
cf2_stack_pop( opStack,
arg_cnt - num_points );
(CF2_UInt)arg_cnt - num_points );
known_othersubr_result_cnt = (FT_Int)num_points;
break;
@ -2052,7 +2052,7 @@
default:
if ( arg_cnt >= 0 && subr_no >= 0 )
{
FT_UInt i;
FT_Int i;
FT_ERROR(( "cf2_interpT2CharString (Type 1 mode):"
" unknown othersubr [%d %d], wish me luck\n",

2
src/psaux/psobjs.c
View File

@ -2368,7 +2368,7 @@
ps_decoder->hint_mode = t1_decoder->hint_mode;
ps_decoder->blend = t1_decoder->blend;
ps_decoder->num_locals = t1_decoder->num_subrs;
ps_decoder->num_locals = (FT_UInt)t1_decoder->num_subrs;
ps_decoder->locals = t1_decoder->subrs;
ps_decoder->locals_len = t1_decoder->subrs_len;
ps_decoder->locals_hash = t1_decoder->subrs_hash;