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

[gxvalid] Fix gcc4.6 compiler warnings in gxvtrak.c. 

* src/gxvalid/gxvtrak.c (gxv_trak_trackTable_validate):
Check different entries pointing same traking value.
(gxv_trak_validate): Remove unused variable `table_size'.
This commit is contained in:
suzuki toshiya 2011-06-14 23:55:23 +09:00
parent 05fc72c5c7
commit f6f9b66781
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2011-06-14 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
[gxvalid] Fix gcc4.6 compiler warnings in gxvtrak.c.
* src/gxvalid/gxvtrak.c (gxv_trak_trackTable_validate):
Check different entries pointing same traking value.
(gxv_trak_validate): Remove unused variable `table_size'.
2011-06-14 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
[gxvalid] Fix gcc4.6 compiler warnings in gxvmorx*.c.

19
src/gxvalid/gxvtrak.c
View File

@ -97,10 +97,10 @@
{
FT_Bytes p = table;
FT_Fixed track;
FT_Fixed track, t;
FT_UShort nameIndex;
FT_UShort offset;
FT_UShort i;
FT_UShort i, j;
GXV_NAME_ENTER( "trackTable" );
@ -108,9 +108,11 @@
GXV_TRAK_DATA( trackValueOffset_min ) = 0xFFFFU;
GXV_TRAK_DATA( trackValueOffset_max ) = 0x0000;
GXV_LIMIT_CHECK( nTracks * ( 4 + 2 + 2 ) );
for ( i = 0; i < nTracks; i ++ )
{
GXV_LIMIT_CHECK( 4 + 2 + 2 );
p = table + i * ( 4 + 2 + 2 );
track = FT_NEXT_LONG( p );
nameIndex = FT_NEXT_USHORT( p );
offset = FT_NEXT_USHORT( p );
@ -121,6 +123,15 @@
GXV_TRAK_DATA( trackValueOffset_max ) = offset;
gxv_sfntName_validate( nameIndex, 256, 32767, valid );
for ( j = i; j < nTracks; j ++ )
{
p = table + j * ( 4 + 2 + 2 );
t = FT_NEXT_LONG( p );
if ( t == track )
GXV_TRACE(( "duplicated entries found for track value 0x%x\n",
track ));
}
}
valid->subtable_length = p - table;
@ -198,7 +209,6 @@
{
FT_Bytes p = table;
FT_Bytes limit = 0;
FT_Offset table_size;
GXV_ValidatorRec validrec;
GXV_Validator valid = &validrec;
@ -220,7 +230,6 @@
valid->face = face;
limit = valid->root->limit;
table_size = limit - table;
FT_TRACE3(( "validating `trak' table\n" ));
GXV_INIT;