rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Next round of minor compiler warning fixes. 

* include/internal/ftrfork.h (FT_RFork_Ref): Change `offset' member
type to `FT_Long'.
(CONST_FT_RFORK_RULE_ARRAY_BEGIN): Add `static' keyword.

* include/internal/ftstream.h (FT_Stream_Pos): Return `FT_ULong'.

* src/base/ftoutln.c, src/base/ftrfork.c, src/base/ftstream.c:
Signedess fixes.
This commit is contained in:
Werner Lemberg 2015-02-16 19:35:16 +01:00
parent 3cfa4d124c
commit 82235d0474
8 changed files with 66 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2015-02-16 Werner Lemberg <wl@gnu.org>
Next round of minor compiler warning fixes.
* include/internal/ftrfork.h (FT_RFork_Ref): Change `offset' member
type to `FT_Long'.
(CONST_FT_RFORK_RULE_ARRAY_BEGIN): Add `static' keyword.
* include/internal/ftstream.h (FT_Stream_Pos): Return `FT_ULong'.
* src/base/ftoutln.c, src/base/ftrfork.c, src/base/ftstream.c:
Signedess fixes.
2015-02-16 Werner Lemberg <wl@gnu.org>
Various minor signedness fixes.

4
include/internal/ftrfork.h
View File

@ -44,7 +44,7 @@ FT_BEGIN_HEADER
typedef struct FT_RFork_Ref_
{
FT_UShort res_id;
FT_ULong offset;
FT_Long offset;
} FT_RFork_Ref;
@ -83,7 +83,7 @@ FT_BEGIN_HEADER
/* this array is a storage in non-PIC mode, so ; is needed in END */
#define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type ) \
const type name[] = {
static const type name[] = {
#define CONST_FT_RFORK_RULE_ARRAY_ENTRY( func_suffix, type_suffix ) \
{ raccess_guess_ ## func_suffix, \
FT_RFork_Rule_ ## type_suffix },

2
include/internal/ftstream.h
View File

@ -361,7 +361,7 @@ FT_BEGIN_HEADER
FT_Long distance );
/* return current stream position */
FT_BASE( FT_Long )
FT_BASE( FT_ULong )
FT_Stream_Pos( FT_Stream stream );
/* read bytes from a stream into a user-allocated buffer, returns an */

2
src/base/ftobjs.c
View File

@ -1495,7 +1495,7 @@
FT_UNUSED( params );
pos = (FT_ULong)FT_Stream_Pos( stream );
pos = FT_STREAM_POS();
error = ft_lookup_PS_in_sfnt_stream( stream,
face_index,

11
src/base/ftoutln.c
View File

@ -279,7 +279,7 @@
if ( error )
goto Exit;
first = last + 1;
first = (FT_UInt)last + 1;
}
FT_TRACE5(( "FT_Outline_Decompose: Done\n", n ));
@ -320,7 +320,7 @@
FT_NEW_ARRAY( anoutline->contours, numContours ) )
goto Fail;
anoutline->n_points = (FT_UShort)numPoints;
anoutline->n_points = (FT_Short)numPoints;
anoutline->n_contours = (FT_Short)numContours;
anoutline->flags |= FT_OUTLINE_OWNER;
@ -1043,7 +1043,7 @@
/* We use the nonzero winding rule to find the orientation. */
/* Since glyph outlines behave much more `regular' than arbitrary */
/* cubic or quadratic curves, this test deals with the polygon */
/* only which is spanned up by the control points. */
/* only that is spanned up by the control points. */
FT_Outline_Get_CBox( outline, &cbox );
@ -1051,10 +1051,11 @@
if ( cbox.xMin == cbox.xMax || cbox.yMin == cbox.yMax )
return FT_ORIENTATION_NONE;
xshift = FT_MSB( FT_ABS( cbox.xMax ) | FT_ABS( cbox.xMin ) ) - 14;
xshift = FT_MSB( (FT_UInt32)( FT_ABS( cbox.xMax ) |
FT_ABS( cbox.xMin ) ) ) - 14;
xshift = FT_MAX( xshift, 0 );
yshift = FT_MSB( cbox.yMax - cbox.yMin ) - 14;
yshift = FT_MSB( (FT_UInt32)( cbox.yMax - cbox.yMin ) ) - 14;
yshift = FT_MAX( yshift, 0 );
points = outline->points;

20
src/base/ftrfork.c
View File

@ -63,7 +63,7 @@
FT_UNUSED( library );
error = FT_Stream_Seek( stream, rfork_offset );
error = FT_Stream_Seek( stream, (FT_ULong)rfork_offset );
if ( error )
return error;
@ -89,7 +89,7 @@
if ( *rdata_pos + rdata_len != map_pos || map_pos == rfork_offset )
return FT_THROW( Unknown_File_Format );
error = FT_Stream_Seek( stream, map_pos );
error = FT_Stream_Seek( stream, (FT_ULong)map_pos );
if ( error )
return error;
@ -124,7 +124,7 @@
if ( type_list == -1 )
return FT_THROW( Unknown_File_Format );
error = FT_Stream_Seek( stream, map_pos + type_list );
error = FT_Stream_Seek( stream, (FT_ULong)( map_pos + type_list ) );
if ( error )
return error;
@ -166,7 +166,7 @@
FT_TRACE3(( "\n" ));
error = FT_Stream_Seek( stream, map_offset );
error = FT_Stream_Seek( stream, (FT_ULong)map_offset );
if ( error )
return error;
@ -194,7 +194,7 @@
*count = subcnt + 1;
rpos += map_offset;
error = FT_Stream_Seek( stream, rpos );
error = FT_Stream_Seek( stream, (FT_ULong)rpos );
if ( error )
return error;
@ -220,7 +220,7 @@
if (sort_by_res_id)
{
ft_qsort( ref, *count, sizeof ( FT_RFork_Ref ),
ft_qsort( ref, (size_t)*count, sizeof ( FT_RFork_Ref ),
( int(*)(const void*, const void*) )
ft_raccess_sort_ref_by_id );
@ -713,9 +713,9 @@
FT_UShort n_of_entries;
int i;
FT_UInt32 entry_id, entry_offset, entry_length = 0;
FT_Int32 entry_id, entry_offset, entry_length = 0;
const FT_UInt32 resource_fork_entry_id = 0x2;
const FT_Int32 resource_fork_entry_id = 0x2;
FT_UNUSED( library );
FT_UNUSED( base_file_name );
@ -813,7 +813,9 @@
tmp = ft_strrchr( original_name, '/' );
if ( tmp )
{
ft_strncpy( new_name, original_name, tmp - original_name + 1 );
ft_strncpy( new_name,
original_name,
(size_t)( tmp - original_name + 1 ) );
new_name[tmp - original_name + 1] = '\0';
slash = tmp + 1;
}

70
src/base/ftstream.c
View File

@ -95,11 +95,11 @@
if ( distance < 0 )
return FT_THROW( Invalid_Stream_Operation );
return FT_Stream_Seek( stream, (FT_ULong)( stream->pos + distance ) );
return FT_Stream_Seek( stream, stream->pos + (FT_ULong)distance );
}
FT_BASE_DEF( FT_Long )
FT_BASE_DEF( FT_ULong )
FT_Stream_Pos( FT_Stream stream )
{
return stream->pos;
@ -260,7 +260,9 @@
#ifdef FT_DEBUG_MEMORY
/* assume _ft_debug_file and _ft_debug_lineno are already set */
stream->base = (unsigned char*)ft_mem_qalloc( memory, count, &error );
stream->base = (unsigned char*)ft_mem_qalloc( memory,
(FT_Long)count,
&error );
if ( error )
goto Exit;
#else
@ -348,7 +350,7 @@
result = 0;
if ( stream->cursor < stream->limit )
result = *stream->cursor++;
result = (FT_Char)*stream->cursor++;
return result;
}
@ -357,8 +359,8 @@
FT_BASE_DEF( FT_UShort )
FT_Stream_GetUShort( FT_Stream stream )
{
FT_Byte* p;
FT_Short result;
FT_Byte* p;
FT_UShort result;
FT_ASSERT( stream && stream->cursor );
@ -376,8 +378,8 @@
FT_BASE_DEF( FT_UShort )
FT_Stream_GetUShortLE( FT_Stream stream )
{
FT_Byte* p;
FT_Short result;
FT_Byte* p;
FT_UShort result;
FT_ASSERT( stream && stream->cursor );
@ -396,7 +398,7 @@
FT_Stream_GetUOffset( FT_Stream stream )
{
FT_Byte* p;
FT_Long result;
FT_ULong result;
FT_ASSERT( stream && stream->cursor );
@ -414,7 +416,7 @@
FT_Stream_GetULong( FT_Stream stream )
{
FT_Byte* p;
FT_Long result;
FT_ULong result;
FT_ASSERT( stream && stream->cursor );
@ -432,7 +434,7 @@
FT_Stream_GetULongLE( FT_Stream stream )
{
FT_Byte* p;
FT_Long result;
FT_ULong result;
FT_ASSERT( stream && stream->cursor );
@ -471,7 +473,7 @@
}
stream->pos++;
return result;
return (FT_Char)result;
Fail:
*error = FT_THROW( Invalid_Stream_Operation );
@ -485,11 +487,11 @@
FT_BASE_DEF( FT_UShort )
FT_Stream_ReadUShort( FT_Stream stream,
FT_Error* error )
FT_Error* error )
{
FT_Byte reads[2];
FT_Byte* p = 0;
FT_Short result = 0;
FT_Byte reads[2];
FT_Byte* p = 0;
FT_UShort result = 0;
FT_ASSERT( stream );
@ -506,9 +508,7 @@
p = reads;
}
else
{
p = stream->base + stream->pos;
}
if ( p )
result = FT_NEXT_USHORT( p );
@ -532,11 +532,11 @@
FT_BASE_DEF( FT_UShort )
FT_Stream_ReadUShortLE( FT_Stream stream,
FT_Error* error )
FT_Error* error )
{
FT_Byte reads[2];
FT_Byte* p = 0;
FT_Short result = 0;
FT_Byte reads[2];
FT_Byte* p = 0;
FT_UShort result = 0;
FT_ASSERT( stream );
@ -553,9 +553,7 @@
p = reads;
}
else
{
p = stream->base + stream->pos;
}
if ( p )
result = FT_NEXT_USHORT_LE( p );
@ -579,11 +577,11 @@
FT_BASE_DEF( FT_ULong )
FT_Stream_ReadUOffset( FT_Stream stream,
FT_Error* error )
FT_Error* error )
{
FT_Byte reads[3];
FT_Byte* p = 0;
FT_Long result = 0;
FT_Byte* p = 0;
FT_ULong result = 0;
FT_ASSERT( stream );
@ -600,9 +598,7 @@
p = reads;
}
else
{
p = stream->base + stream->pos;
}
if ( p )
result = FT_NEXT_UOFF3( p );
@ -626,11 +622,11 @@
FT_BASE_DEF( FT_ULong )
FT_Stream_ReadULong( FT_Stream stream,
FT_Error* error )
FT_Error* error )
{
FT_Byte reads[4];
FT_Byte* p = 0;
FT_Long result = 0;
FT_Byte* p = 0;
FT_ULong result = 0;
FT_ASSERT( stream );
@ -647,9 +643,7 @@
p = reads;
}
else
{
p = stream->base + stream->pos;
}
if ( p )
result = FT_NEXT_ULONG( p );
@ -673,11 +667,11 @@
FT_BASE_DEF( FT_ULong )
FT_Stream_ReadULongLE( FT_Stream stream,
FT_Error* error )
FT_Error* error )
{
FT_Byte reads[4];
FT_Byte* p = 0;
FT_Long result = 0;
FT_Byte* p = 0;
FT_ULong result = 0;
FT_ASSERT( stream );
@ -694,9 +688,7 @@
p = reads;
}
else
{
p = stream->base + stream->pos;
}
if ( p )
result = FT_NEXT_ULONG_LE( p );

2
src/truetype/ttpload.c
View File

@ -124,7 +124,7 @@
TT_Table entry = face->dir_tables;
TT_Table limit = entry + face->num_tables;
FT_Long pos = FT_Stream_Pos( stream );
FT_Long pos = (FT_Long)FT_STREAM_POS();
FT_Long dist = 0x7FFFFFFFL;