ReceiveTempSMS
/
Al-Qurtas-Islamic-bank-The-Best-Bank-in-Iraq
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[psaux] Signedness fixes. 

* include/internal/psaux.h, src/psaux/afmparse.c,
src/psaux/afmparse.h, src/psaux/psconv.c, src/psaux/psobjs.c,
src/psaux/t1cmap.c, src/psaux/t1decode.c: Apply.
This commit is contained in:
Werner Lemberg 2015-02-25 11:20:20 +01:00
parent d25ec16672
commit 04c223703a
8 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2015-02-25 Werner Lemberg <wl@gnu.org>
[psaux] Signedness fixes.
* include/internal/psaux.h, src/psaux/afmparse.c,
src/psaux/afmparse.h, src/psaux/psconv.c, src/psaux/psobjs.c,
src/psaux/t1cmap.c, src/psaux/t1decode.c: Apply.
2015-02-25 Werner Lemberg <wl@gnu.org>
[otvalid] Signedness fixes.

2
include/internal/psaux.h
View File

@ -122,7 +122,7 @@ FT_BEGIN_HEADER
FT_Byte* block; /* current memory block */
FT_Offset cursor; /* current cursor in memory block */
FT_Offset capacity; /* current size of memory block */
FT_Long init;
FT_ULong init;
FT_Int max_elems;
FT_Int num_elems;

10
src/psaux/afmparse.c
View File

@ -75,8 +75,8 @@
#define AFM_STREAM_KEY_BEGIN( stream ) \
(char*)( (stream)->cursor - 1 )
#define AFM_STREAM_KEY_LEN( stream, key ) \
( (char*)(stream)->cursor - key - 1 )
#define AFM_STREAM_KEY_LEN( stream, key ) \
(FT_Offset)( (char*)(stream)->cursor - key - 1 )
#define AFM_STATUS_EOC( stream ) \
( (stream)->status >= AFM_STREAM_STATUS_EOC )
@ -369,11 +369,11 @@
FT_LOCAL_DEF( FT_Int )
afm_parser_read_vals( AFM_Parser parser,
AFM_Value vals,
FT_UInt n )
FT_Int n )
{
AFM_Stream stream = parser->stream;
char* str;
FT_UInt i;
FT_Int i;
if ( n > AFM_MAX_ARGUMENTS )
@ -828,7 +828,7 @@
static FT_Error
afm_parser_skip_section( AFM_Parser parser,
FT_UInt n,
FT_Int n,
AFM_Token end_section )
{
char* key;

2
src/psaux/afmparse.h
View File

@ -73,7 +73,7 @@ FT_BEGIN_HEADER
FT_LOCAL( FT_Int )
afm_parser_read_vals( AFM_Parser parser,
AFM_Value vals,
FT_UInt n );
FT_Int n );
/* read the next key from the next line or column */
FT_LOCAL( char* )

4
src/psaux/psconv.c
View File

@ -489,8 +489,8 @@
if ( c OP 0x80 )
break;
c = ft_char_table[c & 0x7F];
if ( (unsigned)c >= 16 )
c = (FT_UInt)ft_char_table[c & 0x7F];
if ( c >= 16 )
break;
pad = ( pad << 4 ) | c;

4
src/psaux/psobjs.c
View File

@ -1224,7 +1224,7 @@
for ( i = 0; i < 4; i++ )
{
result = ps_tofixedarray( &cur, limit, max_objects,
result = ps_tofixedarray( &cur, limit, (FT_Int)max_objects,
temp + i * max_objects, 0 );
if ( result < 0 || (FT_UInt)result < max_objects )
{
@ -1315,7 +1315,7 @@
goto Exit;
}
if ( (FT_UInt)num_elements > field->array_max )
num_elements = field->array_max;
num_elements = (FT_Int)field->array_max;
old_cursor = parser->cursor;
old_limit = parser->limit;

8
src/psaux/t1cmap.c
View File

@ -39,7 +39,7 @@
FT_Service_PsCMaps psnames = (FT_Service_PsCMaps)face->psnames;
cmap->num_glyphs = face->type1.num_glyphs;
cmap->num_glyphs = (FT_UInt)face->type1.num_glyphs;
cmap->glyph_names = (const char* const*)face->type1.glyph_names;
cmap->sid_to_string = psnames->adobe_std_strings;
cmap->code_to_sid = is_expert ? psnames->adobe_expert_encoding
@ -189,8 +189,8 @@
FT_UNUSED( pointer );
cmap->first = encoding->code_first;
cmap->count = (FT_UInt)( encoding->code_last - cmap->first );
cmap->first = (FT_UInt)encoding->code_first;
cmap->count = (FT_UInt)encoding->code_last - cmap->first;
cmap->indices = encoding->char_index;
FT_ASSERT( cmap->indices != NULL );
@ -295,7 +295,7 @@
return psnames->unicodes_init( memory,
unicodes,
face->type1.num_glyphs,
(FT_UInt)face->type1.num_glyphs,
(PS_GetGlyphNameFunc)&psaux_get_glyph_name,
(PS_FreeGlyphNameFunc)NULL,
(FT_Pointer)face );

26
src/psaux/t1decode.c
View File

@ -150,7 +150,7 @@
if ( name &&
name[0] == glyph_name[0] &&
ft_strcmp( name, glyph_name ) == 0 )
return n;
return (FT_Int)n;
}
return -1;
@ -298,7 +298,7 @@
/* the seac operator must not be nested */
decoder->seac = TRUE;
error = t1_decoder_parse_glyph( decoder, bchar_index );
error = t1_decoder_parse_glyph( decoder, (FT_UInt)bchar_index );
decoder->seac = FALSE;
if ( error )
goto Exit;
@ -320,7 +320,7 @@
/* the seac operator must not be nested */
decoder->seac = TRUE;
error = t1_decoder_parse_glyph( decoder, achar_index );
error = t1_decoder_parse_glyph( decoder, (FT_UInt)achar_index );
decoder->seac = FALSE;
if ( error )
goto Exit;
@ -381,10 +381,10 @@
/* compute random seed from stack address of parameter */
seed = (FT_Fixed)( ( (FT_PtrDist)(char*)&seed ^
(FT_PtrDist)(char*)&decoder ^
(FT_PtrDist)(char*)&charstring_base ) &
FT_ULONG_MAX ) ;
seed = (FT_Fixed)( ( (FT_Offset)(char*)&seed ^
(FT_Offset)(char*)&decoder ^
(FT_Offset)(char*)&charstring_base ) &
FT_ULONG_MAX );
seed = ( seed ^ ( seed >> 10 ) ^ ( seed >> 20 ) ) & 0xFFFFL;
if ( seed == 0 )
seed = 0x7384;
@ -796,7 +796,8 @@
known_othersubr_result_cnt = 1;
if ( hinter )
hinter->reset( hinter->hints, builder->current->n_points );
hinter->reset( hinter->hints,
(FT_UInt)builder->current->n_points );
break;
case 12:
@ -861,7 +862,7 @@
*values++ = tmp;
}
known_othersubr_result_cnt = num_points;
known_othersubr_result_cnt = (FT_Int)num_points;
break;
}
@ -879,8 +880,8 @@
idx = Fix2Int( top[0] );
if ( idx < 0 ||
idx + blend->num_designs > decoder->len_buildchar )
if ( idx < 0 ||
(FT_UInt)idx + blend->num_designs > decoder->len_buildchar )
goto Unexpected_OtherSubr;
ft_memcpy( &decoder->buildchar[idx],
@ -1094,7 +1095,8 @@
/* close hints recording session */
if ( hinter )
{
if ( hinter->close( hinter->hints, builder->current->n_points ) )
if ( hinter->close( hinter->hints,
(FT_UInt)builder->current->n_points ) )
goto Syntax_Error;
/* apply hints to the loaded glyph outline now */