Chiebot-Mirror
/
freetype
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[truetype] More signedness fixes.

Browse Source 
* include/internal/tttypes.h, src/truetype/ttinterp.h,
src/truetype/ttobjs.h, src/truetype/ttinterp.c,
src/truetype/ttobjs.c: Apply.
2.6.5
Werner Lemberg 10 years ago
parent 0a33a3984f
commit d9c3f15117
6 changed files with 32 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      ChangeLog
  2. 2
      include/internal/tttypes.h
  3. 34
      src/truetype/ttinterp.c
  4. 6
      src/truetype/ttinterp.h
  5. 4
      src/truetype/ttobjs.c
  6. 2
      src/truetype/ttobjs.h

8
ChangeLog
Unescape View File

@ -1,3 +1,11 @@
2015-02-17 Werner Lemberg <wl@gnu.org>
[truetype] More signedness fixes.
* include/internal/tttypes.h, src/truetype/ttinterp.h,
src/truetype/ttobjs.h, src/truetype/ttinterp.c,
src/truetype/ttobjs.c: Apply.
2015-02-17 Werner Lemberg <wl@gnu.org>
[truetype] Various signedness fixes.

2
include/internal/tttypes.h
Unescape View File

@ -1440,7 +1440,7 @@ FT_BEGIN_HEADER
{
FT_Memory memory;
FT_UShort max_points;
FT_UShort max_contours;
FT_Short max_contours;
FT_UShort n_points; /* number of points in zone */
FT_Short n_contours; /* number of contours */

34
src/truetype/ttinterp.c
Unescape View File

@ -158,7 +158,7 @@
/* which will return to the first byte *after* the code */
/* range, we test for IP <= Size instead of IP < Size. */
/* */
FT_ASSERT( (FT_ULong)IP <= coderange->size );
FT_ASSERT( IP <= coderange->size );
exec->code = coderange->base;
exec->codeSize = coderange->size;
@ -359,7 +359,7 @@
FT_LOCAL_DEF( FT_Error )
Update_Max( FT_Memory memory,
FT_ULong* size,
FT_Long multiplier,
FT_ULong multiplier,
void* _pbuff,
FT_ULong new_max )
{
@ -452,13 +452,13 @@
/* XXX: We reserve a little more elements on the stack to deal safely */
/* with broken fonts like arialbs, courbs, timesbs, etc. */
tmp = exec->stackSize;
tmp = (FT_ULong)exec->stackSize;
error = Update_Max( exec->memory,
&tmp,
sizeof ( FT_F26Dot6 ),
(void*)&exec->stack,
maxp->maxStackElements + 32 );
exec->stackSize = (FT_UInt)tmp;
exec->stackSize = (FT_Long)tmp;
if ( error )
return error;
@ -1633,7 +1633,7 @@
static FT_Bool
Ins_Goto_CodeRange( TT_ExecContext exc,
FT_Int aRange,
FT_ULong aIP )
FT_Long aIP )
{
TT_CodeRange* range;
@ -2352,7 +2352,7 @@
FT_ASSERT( !exc->face->unpatented_hinting );
#endif
return TT_DotFix14( (FT_UInt32)dx, (FT_UInt32)dy,
return TT_DotFix14( dx, dy,
exc->GS.projVector.x,
exc->GS.projVector.y );
}
@ -2379,7 +2379,7 @@
FT_Pos dx,
FT_Pos dy )
{
return TT_DotFix14( (FT_UInt32)dx, (FT_UInt32)dy,
return TT_DotFix14( dx, dy,
exc->GS.dualVector.x,
exc->GS.dualVector.y );
}
@ -3621,7 +3621,7 @@
rec = exc->FDefs;
limit = rec + exc->numFDefs;
n = args[0];
n = (FT_ULong)args[0];
for ( ; rec < limit; rec++ )
{
@ -3863,7 +3863,7 @@
/* first of all, check the index */
F = args[0];
F = (FT_ULong)args[0];
if ( BOUNDSL( F, exc->maxFunc + 1 ) )
goto Fail;
@ -3951,7 +3951,7 @@
/* first of all, check the index */
F = args[1];
F = (FT_ULong)args[1];
if ( BOUNDSL( F, exc->maxFunc + 1 ) )
goto Fail;
@ -5528,7 +5528,7 @@
FT_UShort start, limit, i;
contour = (FT_UShort)args[0];
contour = (FT_Short)args[0];
bounds = ( exc->GS.gep2 == 0 ) ? 1 : exc->zp2.n_contours;
if ( BOUNDS( contour, bounds ) )
@ -5651,8 +5651,8 @@
else
#endif
{
dx = TT_MulFix14( (FT_UInt32)args[0], exc->GS.freeVector.x );
dy = TT_MulFix14( (FT_UInt32)args[0], exc->GS.freeVector.y );
dx = TT_MulFix14( args[0], exc->GS.freeVector.x );
dy = TT_MulFix14( args[0], exc->GS.freeVector.y );
}
while ( exc->GS.loop > 0 )
@ -5953,9 +5953,9 @@
( !exc->ignore_x_mode ||
!exc->face->sph_compatibility_mode ) )
#endif /* TT_CONFIG_OPTION_SUBPIXEL_HINTING */
exc->zp0.org[point].x = TT_MulFix14( (FT_UInt32)distance,
exc->zp0.org[point].x = TT_MulFix14( distance,
exc->GS.freeVector.x );
exc->zp0.org[point].y = TT_MulFix14( (FT_UInt32)distance,
exc->zp0.org[point].y = TT_MulFix14( distance,
exc->GS.freeVector.y ),
exc->zp0.cur[point] = exc->zp0.org[point];
}
@ -6206,10 +6206,10 @@
if ( exc->GS.gep1 == 0 )
{
exc->zp1.org[point].x = exc->zp0.org[exc->GS.rp0].x +
TT_MulFix14( (FT_UInt32)cvt_dist,
TT_MulFix14( cvt_dist,
exc->GS.freeVector.x );
exc->zp1.org[point].y = exc->zp0.org[exc->GS.rp0].y +
TT_MulFix14( (FT_UInt32)cvt_dist,
TT_MulFix14( cvt_dist,
exc->GS.freeVector.y );
exc->zp1.cur[point] = exc->zp1.org[point];
}

6
src/truetype/ttinterp.h
Unescape View File

@ -158,11 +158,11 @@ FT_BEGIN_HEADER
FT_Long top; /* top of exec. stack */
FT_UInt stackSize; /* size of exec. stack */
FT_Long stackSize; /* size of exec. stack */
FT_Long* stack; /* current exec. stack */
FT_Long args;
FT_UInt new_top; /* new top after exec. */
FT_Long new_top; /* new top after exec. */
TT_GlyphZoneRec zp0, /* zone records */
zp1,
@ -303,7 +303,7 @@ FT_BEGIN_HEADER
FT_LOCAL( FT_Error )
Update_Max( FT_Memory memory,
FT_ULong* size,
FT_Long multiplier,
FT_ULong multiplier,
void* _pbuff,
FT_ULong new_max );
#endif /* TT_USE_BYTECODE_INTERPRETER */

4
src/truetype/ttobjs.c
Unescape View File

@ -788,7 +788,7 @@
TT_Set_CodeRange( exec,
tt_coderange_font,
face->font_program,
face->font_program_size );
(FT_Long)face->font_program_size );
/* disable CVT and glyph programs coderange */
TT_Clear_CodeRange( exec, tt_coderange_cvt );
@ -854,7 +854,7 @@
TT_Set_CodeRange( exec,
tt_coderange_cvt,
face->cvt_program,
face->cvt_program_size );
(FT_Long)face->cvt_program_size );
TT_Clear_CodeRange( exec, tt_coderange_glyph );

2
src/truetype/ttobjs.h
Unescape View File

@ -160,7 +160,7 @@ FT_BEGIN_HEADER
typedef struct TT_CodeRange_
{
FT_Byte* base;
FT_ULong size;
FT_Long size;
} TT_CodeRange;

Write Preview
Loading…
Cancel
Save