From 3b7049fe103238f094282f207576437fa511cc05 Mon Sep 17 00:00:00 2001 From: David Turner Date: Sat, 7 Jul 2001 16:12:14 +0000 Subject: [PATCH] removed pedantic compiler warnings when the bytecode interpreter is compiled in the library --- ChangeLog | 6 ++++++ src/pcf/pcfread.c | 2 +- src/truetype/ttgload.c | 2 +- src/truetype/ttinterp.c | 28 +++++++++++++++------------- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44b701419..2ab12c778 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-07-07 David Turner + + * src/truetype/ttgload.c, src/truetype/ttinterp.c, src/pcf/pcfread: + removed pedantic compiler warnings when the bytecode interpreter is + compiled in + 2001-07-03 Werner Lemberg * src/autohint/ahhint.c (ah_hinter_align_weak_points): Remove diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c index 4e25df35c..eac265e86 100644 --- a/src/pcf/pcfread.c +++ b/src/pcf/pcfread.c @@ -718,7 +718,7 @@ THE SOFTWARE. else encodingOffset = GET_ShortLE(); - if ( encodingOffset != (signed short)0xFFFF ) + if ( encodingOffset != -1 ) { tmpEncoding[j].enc = ( ( ( i / ( lastCol - firstCol + 1 ) ) + firstRow ) * 256 ) + diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c index 6558f61f8..3f89fa7d4 100644 --- a/src/truetype/ttgload.c +++ b/src/truetype/ttgload.c @@ -1046,7 +1046,7 @@ start_point, start_contour ); pts = &exec->pts; - pts->n_points = num_points + 2; + pts->n_points = (short)(num_points + 2); pts->n_contours = gloader->base.outline.n_contours; /* add phantom points */ diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index 8ad09a769..6e1d85fb7 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -2294,12 +2294,14 @@ FT_Vector v; FT_Angle angle; + FT_UNUSED_EXEC; + angle = FT_Atan2( Vx, Vy ); FT_Vector_Unit( &v, angle ); - R->x = v.x >> 2; - R->y = v.y >> 2; + R->x = (short)(v.x >> 2); + R->y = (short)(v.y >> 2); return SUCCESS; } @@ -3943,12 +3945,12 @@ break; case 0x1B: /* ELSE */ - Out = ( nIfs == 1 ); + Out = FT_BOOL( nIfs == 1 ); break; case 0x59: /* EIF */ nIfs--; - Out = ( nIfs == 0 ); + Out = FT_BOOL( nIfs == 0 ); break; } } while ( Out == 0 ); @@ -4404,7 +4406,7 @@ FT_UShort L, K; - L = (FT_UShort)CUR.opcode - 0xB0 + 1; + L = (FT_UShort)(CUR.opcode - 0xB0 + 1); if ( BOUNDS( L, CUR.stackSize + 1 - CUR.top ) ) { @@ -4429,7 +4431,7 @@ FT_UShort L, K; - L = (FT_UShort)CUR.opcode - 0xB8 + 1; + L = (FT_UShort)(CUR.opcode - 0xB8 + 1); if ( BOUNDS( L, CUR.stackSize + 1 - CUR.top ) ) { @@ -4789,8 +4791,8 @@ if ( L != 0 ) L = K; - CUR.GS.instruct_control = - (FT_Byte)( CUR.GS.instruct_control & ~(FT_Byte)K ) | (FT_Byte)L; + CUR.GS.instruct_control = FT_BOOL( + ( (FT_Byte)CUR.GS.instruct_control & ~(FT_Byte)K ) | (FT_Byte)L ); } @@ -5140,7 +5142,7 @@ if ( contour == 0 ) first_point = 0; else - first_point = CUR.pts.contours[contour - 1] + 1; + first_point = (FT_UShort)(CUR.pts.contours[contour - 1] + 1); last_point = CUR.pts.contours[contour]; @@ -5149,7 +5151,7 @@ if ( last_point > CUR.zp2.n_points ) { if ( CUR.zp2.n_points > 0 ) - last_point = CUR.zp2.n_points - 1; + last_point = (FT_UShort)(CUR.zp2.n_points - 1); else last_point = 0; } @@ -5191,7 +5193,7 @@ return; if ( CUR.zp2.n_points > 0 ) - last_point = CUR.zp2.n_points - 1; + last_point = (FT_UShort)(CUR.zp2.n_points - 1); else last_point = 0; @@ -6758,8 +6760,8 @@ FT_Short AA, BB; - AA = (FT_Short)( opcode & 1 ) << 14; - BB = AA ^ (FT_Short)0x4000; + AA = (FT_Short)(( opcode & 1 ) << 14); + BB = (FT_Short)( AA ^ 0x4000 ); if ( opcode < 4 ) {