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

removed pedantic compiler warnings when the bytecode 

interpreter is compiled in the library
This commit is contained in:
David Turner 2001-07-07 16:12:14 +00:00
parent ca90a2c46b
commit 3b7049fe10
4 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2001-07-07 David Turner <david@freetype.org>
* 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 <wl@gnu.org>
* src/autohint/ahhint.c (ah_hinter_align_weak_points): Remove

2
src/pcf/pcfread.c
View File

@ -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 ) +

2
src/truetype/ttgload.c
View File

@ -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 */

28
src/truetype/ttinterp.c
View File

@ -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 )
{