ReceiveTempSMS
/
Al-Qurtas-Islamic-bank-The-Best-Bank-in-Iraq
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* src/gxvalid.*, src/otvalid.*: Fix `-Wformat` warnings.

This commit is contained in:
Werner Lemberg 2021-11-08 11:15:50 +01:00
parent cce782281b
commit b86f96bce6
14 changed files with 80 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gxvalid/gxvcommn.c
View File

@ -438,7 +438,7 @@
GXV_LIMIT_CHECK( 2 ); GXV_LIMIT_CHECK( 2 );
if ( p + 2 >= limit ) /* some fonts have too-short fmt0 array */ if ( p + 2 >= limit ) /* some fonts have too-short fmt0 array */
{ {
GXV_TRACE(( "too short, glyphs %d - %d are missing\n", GXV_TRACE(( "too short, glyphs %d - %ld are missing\n",
i, gxvalid->face->num_glyphs )); i, gxvalid->face->num_glyphs ));
GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID ); GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID );
break; break;
@ -533,7 +533,7 @@
if ( lastGlyph < firstGlyph ) if ( lastGlyph < firstGlyph )
{ {
GXV_TRACE(( "reverse ordered range specification at unit %d:", GXV_TRACE(( "reverse ordered range specification at unit %d:"
" lastGlyph %d < firstGlyph %d ", " lastGlyph %d < firstGlyph %d ",
unit, lastGlyph, firstGlyph )); unit, lastGlyph, firstGlyph ));
GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID ); GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID );
@ -604,7 +604,7 @@
if ( lastGlyph < firstGlyph ) if ( lastGlyph < firstGlyph )
{ {
GXV_TRACE(( "reverse ordered range specification at unit %d:", GXV_TRACE(( "reverse ordered range specification at unit %d:"
" lastGlyph %d < firstGlyph %d ", " lastGlyph %d < firstGlyph %d ",
unit, lastGlyph, firstGlyph )); unit, lastGlyph, firstGlyph ));
GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID ); GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID );
@ -824,7 +824,7 @@
face = gxvalid->face; face = gxvalid->face;
if ( face->num_glyphs < gid ) if ( face->num_glyphs < gid )
{ {
GXV_TRACE(( " gxv_glyphid_check() gid overflow: num_glyphs %d < %d\n", GXV_TRACE(( " gxv_glyphid_check() gid overflow: num_glyphs %ld < %d\n",
face->num_glyphs, gid )); face->num_glyphs, gid ));
GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID ); GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID );
} }
@ -1418,7 +1418,7 @@
GXV_NAME_ENTER( "XStateArray" ); GXV_NAME_ENTER( "XStateArray" );
GXV_TRACE(( "parse % 3d bytes by stateSize=% 3d maxClassID=% 3d\n", GXV_TRACE(( "parse % 3d bytes by stateSize=% 3d maxClassID=% 3d\n",
(int)(*length_p), stateSize, (int)(maxClassID) )); (int)(*length_p), (int)stateSize, (int)(maxClassID) ));
/* /*
* 2 states are predefined and must be described: * 2 states are predefined and must be described:
@ -1582,10 +1582,10 @@
stateArray = FT_NEXT_ULONG( p ); stateArray = FT_NEXT_ULONG( p );
entryTable = FT_NEXT_ULONG( p ); entryTable = FT_NEXT_ULONG( p );
GXV_TRACE(( "nClasses =0x%08x\n", gxvalid->xstatetable.nClasses )); GXV_TRACE(( "nClasses =0x%08lx\n", gxvalid->xstatetable.nClasses ));
GXV_TRACE(( "offset to classTable=0x%08x\n", classTable )); GXV_TRACE(( "offset to classTable=0x%08lx\n", classTable ));
GXV_TRACE(( "offset to stateArray=0x%08x\n", stateArray )); GXV_TRACE(( "offset to stateArray=0x%08lx\n", stateArray ));
GXV_TRACE(( "offset to entryTable=0x%08x\n", entryTable )); GXV_TRACE(( "offset to entryTable=0x%08lx\n", entryTable ));
if ( gxvalid->xstatetable.nClasses > 0xFFFFU ) if ( gxvalid->xstatetable.nClasses > 0xFFFFU )
FT_INVALID_DATA; FT_INVALID_DATA;

28
src/gxvalid/gxvcommn.h
View File

@ -261,17 +261,17 @@ FT_BEGIN_HEADER
} GXV_ValidatorRec; } GXV_ValidatorRec;
#define GXV_TABLE_DATA( tag, field ) \ #define GXV_TABLE_DATA( tag, field ) \
( ( (GXV_ ## tag ## _Data)gxvalid->table_data )->field ) ( ( (GXV_ ## tag ## _Data)gxvalid->table_data )->field )
#undef FT_INVALID_ #undef FT_INVALID_
#define FT_INVALID_( _error ) \ #define FT_INVALID_( _error ) \
ft_validator_error( gxvalid->root, FT_THROW( _error ) ) ft_validator_error( gxvalid->root, FT_THROW( _error ) )
#define GXV_LIMIT_CHECK( _count ) \ #define GXV_LIMIT_CHECK( _count ) \
FT_BEGIN_STMNT \ FT_BEGIN_STMNT \
if ( p + _count > ( limit? limit : gxvalid->root->limit ) ) \ if ( p + _count > ( limit? limit : gxvalid->root->limit ) ) \
FT_INVALID_TOO_SHORT; \ FT_INVALID_TOO_SHORT; \
FT_END_STMNT FT_END_STMNT
@ -279,19 +279,19 @@ FT_BEGIN_HEADER
#define GXV_INIT gxvalid->debug_indent = 0 #define GXV_INIT gxvalid->debug_indent = 0
#define GXV_NAME_ENTER( name ) \ #define GXV_NAME_ENTER( name ) \
FT_BEGIN_STMNT \ FT_BEGIN_STMNT \
gxvalid->debug_indent += 2; \ gxvalid->debug_indent += 2; \
FT_TRACE4(( "%*.s", gxvalid->debug_indent, 0 )); \ FT_TRACE4(( "%*.s", gxvalid->debug_indent, "" )); \
FT_TRACE4(( "%s table\n", name )); \ FT_TRACE4(( "%s table\n", name )); \
FT_END_STMNT FT_END_STMNT
#define GXV_EXIT gxvalid->debug_indent -= 2 #define GXV_EXIT gxvalid->debug_indent -= 2
#define GXV_TRACE( s ) \ #define GXV_TRACE( s ) \
FT_BEGIN_STMNT \ FT_BEGIN_STMNT \
FT_TRACE4(( "%*.s", gxvalid->debug_indent, 0 )); \ FT_TRACE4(( "%*.s", gxvalid->debug_indent, "" )); \
FT_TRACE4( s ); \ FT_TRACE4( s ); \
FT_END_STMNT FT_END_STMNT
#else /* !FT_DEBUG_LEVEL_TRACE */ #else /* !FT_DEBUG_LEVEL_TRACE */

2
src/gxvalid/gxvfeat.c
View File

@ -90,7 +90,7 @@
if ( feature >= gxv_feat_registry_length ) if ( feature >= gxv_feat_registry_length )
{ {
GXV_TRACE(( "feature number %d is out of range %d\n", GXV_TRACE(( "feature number %d is out of range %lu\n",
feature, gxv_feat_registry_length )); feature, gxv_feat_registry_length ));
GXV_SET_ERR_IF_PARANOID( FT_INVALID_DATA ); GXV_SET_ERR_IF_PARANOID( FT_INVALID_DATA );
goto Exit; goto Exit;

21
src/gxvalid/gxvjust.c
View File

@ -78,7 +78,7 @@
return; return;
GXV_TRACE(( "just table includes too large %s" GXV_TRACE(( "just table includes too large %s"
" GID=%d > %d (in maxp)\n", " GID=%d > %ld (in maxp)\n",
msg_tag, gid, gxvalid->face->num_glyphs )); msg_tag, gid, gxvalid->face->num_glyphs ));
GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID ); GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID );
} }
@ -140,7 +140,7 @@
count = FT_NEXT_ULONG( p ); count = FT_NEXT_ULONG( p );
for ( i = 0; i < count; i++ ) for ( i = 0; i < count; i++ )
{ {
GXV_TRACE(( "validating wdc pair %d/%d\n", i + 1, count )); GXV_TRACE(( "validating wdc pair %lu/%lu\n", i + 1, count ));
gxv_just_wdp_entry_validate( p, limit, gxvalid ); gxv_just_wdp_entry_validate( p, limit, gxvalid );
p += gxvalid->subtable_length; p += gxvalid->subtable_length;
} }
@ -206,7 +206,8 @@
if ( lowerLimit >= upperLimit ) if ( lowerLimit >= upperLimit )
{ {
GXV_TRACE(( "just table includes invalid range spec:" GXV_TRACE(( "just table includes invalid range spec:"
" lowerLimit(%d) > upperLimit(%d)\n" )); " lowerLimit(%ld) > upperLimit(%ld)\n",
lowerLimit, upperLimit ));
GXV_SET_ERR_IF_PARANOID( FT_INVALID_DATA ); GXV_SET_ERR_IF_PARANOID( FT_INVALID_DATA );
} }
@ -294,14 +295,14 @@
gxvalid->subtable_length = (FT_ULong)( p - table ); gxvalid->subtable_length = (FT_ULong)( p - table );
if ( variantsAxis != 0x64756374L ) /* 'duct' */ if ( variantsAxis != 0x64756374L ) /* 'duct' */
GXV_TRACE(( "variantsAxis 0x%08x is non default value", GXV_TRACE(( "variantsAxis 0x%08lx is non default value",
variantsAxis )); variantsAxis ));
if ( minimumLimit > noStretchValue ) if ( minimumLimit > noStretchValue )
GXV_TRACE(( "type4:minimumLimit 0x%08x > noStretchValue 0x%08x\n", GXV_TRACE(( "type4:minimumLimit 0x%08lx > noStretchValue 0x%08lx\n",
minimumLimit, noStretchValue )); minimumLimit, noStretchValue ));
else if ( noStretchValue > maximumLimit ) else if ( noStretchValue > maximumLimit )
GXV_TRACE(( "type4:noStretchValue 0x%08x > maximumLimit 0x%08x\n", GXV_TRACE(( "type4:noStretchValue 0x%08lx > maximumLimit 0x%08lx\n",
noStretchValue, maximumLimit )); noStretchValue, maximumLimit ));
else if ( !IS_PARANOID_VALIDATION ) else if ( !IS_PARANOID_VALIDATION )
return; return;
@ -389,7 +390,7 @@
GXV_LIMIT_CHECK( 4 ); GXV_LIMIT_CHECK( 4 );
actionCount = FT_NEXT_ULONG( p ); actionCount = FT_NEXT_ULONG( p );
GXV_TRACE(( "actionCount = %d\n", actionCount )); GXV_TRACE(( "actionCount = %lu\n", actionCount ));
for ( i = 0; i < actionCount; i++ ) for ( i = 0; i < actionCount; i++ )
{ {
@ -514,14 +515,14 @@
coverage = FT_NEXT_USHORT( p ); coverage = FT_NEXT_USHORT( p );
subFeatureFlags = FT_NEXT_ULONG( p ); subFeatureFlags = FT_NEXT_ULONG( p );
GXV_TRACE(( " justClassTable: coverage = 0x%04x (%s) ", coverage )); GXV_TRACE(( " justClassTable: coverage = 0x%04x ", coverage ));
if ( ( coverage & 0x4000 ) == 0 ) if ( ( coverage & 0x4000 ) == 0 )
GXV_TRACE(( "ascending\n" )); GXV_TRACE(( "ascending\n" ));
else else
GXV_TRACE(( "descending\n" )); GXV_TRACE(( "descending\n" ));
if ( subFeatureFlags ) if ( subFeatureFlags )
GXV_TRACE(( " justClassTable: nonzero value (0x%08x)" GXV_TRACE(( " justClassTable: nonzero value (0x%08lx)"
" in unused subFeatureFlags\n", subFeatureFlags )); " in unused subFeatureFlags\n", subFeatureFlags ));
gxvalid->statetable.optdata = NULL; gxvalid->statetable.optdata = NULL;
@ -684,7 +685,7 @@
/* Version 1.0 (always:2000) */ /* Version 1.0 (always:2000) */
GXV_TRACE(( " (version = 0x%08x)\n", version )); GXV_TRACE(( " (version = 0x%08lx)\n", version ));
if ( version != 0x00010000UL ) if ( version != 0x00010000UL )
FT_INVALID_FORMAT; FT_INVALID_FORMAT;

10
src/gxvalid/gxvkern.c
View File

@ -487,7 +487,7 @@
if ( gxvalid->face->num_glyphs != glyphCount ) if ( gxvalid->face->num_glyphs != glyphCount )
{ {
GXV_TRACE(( "maxGID=%d, but glyphCount=%d\n", GXV_TRACE(( "maxGID=%ld, but glyphCount=%d\n",
gxvalid->face->num_glyphs, glyphCount )); gxvalid->face->num_glyphs, glyphCount ));
GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID ); GXV_SET_ERR_IF_PARANOID( FT_INVALID_GLYPH_ID );
} }
@ -772,7 +772,7 @@
tupleIndex = 0; tupleIndex = 0;
#endif #endif
GXV_TRACE(( "Subtable version = %d\n", version )); GXV_TRACE(( "Subtable version = %d\n", version ));
GXV_TRACE(( "Subtable length = %d\n", length )); GXV_TRACE(( "Subtable length = %lu\n", length ));
break; break;
case KERN_DIALECT_APPLE: case KERN_DIALECT_APPLE:
@ -783,7 +783,7 @@
#ifdef GXV_LOAD_TRACE_VARS #ifdef GXV_LOAD_TRACE_VARS
tupleIndex = 0; tupleIndex = 0;
#endif #endif
GXV_TRACE(( "Subtable length = %d\n", length )); GXV_TRACE(( "Subtable length = %lu\n", length ));
if ( KERN_IS_NEW( gxvalid ) ) if ( KERN_IS_NEW( gxvalid ) )
{ {
@ -800,7 +800,7 @@
default: default:
length = u16[1]; length = u16[1];
GXV_TRACE(( "cannot detect subtable dialect, " GXV_TRACE(( "cannot detect subtable dialect, "
"just skip %d byte\n", length )); "just skip %lu byte\n", length ));
goto Exit; goto Exit;
} }
@ -884,7 +884,7 @@
for ( i = 0; i < nTables; i++ ) for ( i = 0; i < nTables; i++ )
{ {
GXV_TRACE(( "validating subtable %d/%d\n", i, nTables )); GXV_TRACE(( "validating subtable %d/%lu\n", i, nTables ));
/* p should be 32bit-aligned? */ /* p should be 32bit-aligned? */
gxv_kern_subtable_validate( p, 0, gxvalid ); gxv_kern_subtable_validate( p, 0, gxvalid );
p += gxvalid->subtable_length; p += gxvalid->subtable_length;

2
src/gxvalid/gxvmort.c
View File

@ -288,7 +288,7 @@
for ( i = 0; i < nChains; i++ ) for ( i = 0; i < nChains; i++ )
{ {
GXV_TRACE(( "validating chain %d/%d\n", i + 1, nChains )); GXV_TRACE(( "validating chain %lu/%lu\n", i + 1, nChains ));
GXV_32BIT_ALIGNMENT_VALIDATE( p - table ); GXV_32BIT_ALIGNMENT_VALIDATE( p - table );
gxv_mort_chain_validate( p, limit, gxvalid ); gxv_mort_chain_validate( p, limit, gxvalid );
p += gxvalid->subtable_length; p += gxvalid->subtable_length;

12
src/gxvalid/gxvmort2.c
View File

@ -152,7 +152,7 @@
GXV_32BIT_ALIGNMENT_VALIDATE( ligActionOffset ); GXV_32BIT_ALIGNMENT_VALIDATE( ligActionOffset );
if ( p < lat_base ) if ( p < lat_base )
{ {
GXV_TRACE(( "too short offset 0x%04x: p < lat_base (%d byte rewind)\n", GXV_TRACE(( "too short offset 0x%04x: p < lat_base (%ld byte rewind)\n",
ligActionOffset, lat_base - p )); ligActionOffset, lat_base - p ));
/* FontValidator, ftxvalidator, ftxdumperfuser warn but continue */ /* FontValidator, ftxvalidator, ftxdumperfuser warn but continue */
@ -160,7 +160,7 @@
} }
else if ( lat_limit < p ) else if ( lat_limit < p )
{ {
GXV_TRACE(( "too large offset 0x%04x: lat_limit < p (%d byte overrun)\n", GXV_TRACE(( "too large offset 0x%04x: lat_limit < p (%ld byte overrun)\n",
ligActionOffset, p - lat_limit )); ligActionOffset, p - lat_limit ));
/* FontValidator, ftxvalidator, ftxdumperfuser warn but continue */ /* FontValidator, ftxvalidator, ftxdumperfuser warn but continue */
@ -187,17 +187,17 @@
offset = lig_action & 0x3FFFFFFFUL; offset = lig_action & 0x3FFFFFFFUL;
if ( offset * 2 < optdata->ligatureTable ) if ( offset * 2 < optdata->ligatureTable )
{ {
GXV_TRACE(( "too short offset 0x%08x:" GXV_TRACE(( "too short offset 0x%08lx:"
" 2 x offset < ligatureTable (%d byte rewind)\n", " 2 x offset < ligatureTable (%lu byte rewind)\n",
offset, optdata->ligatureTable - offset * 2 )); offset, optdata->ligatureTable - offset * 2 ));
GXV_SET_ERR_IF_PARANOID( FT_INVALID_OFFSET ); GXV_SET_ERR_IF_PARANOID( FT_INVALID_OFFSET );
} else if ( offset * 2 > } else if ( offset * 2 >
optdata->ligatureTable + optdata->ligatureTable_length ) optdata->ligatureTable + optdata->ligatureTable_length )
{ {
GXV_TRACE(( "too long offset 0x%08x:" GXV_TRACE(( "too long offset 0x%08lx:"
" 2 x offset > ligatureTable + ligatureTable_length" " 2 x offset > ligatureTable + ligatureTable_length"
" (%d byte overrun)\n", " (%lu byte overrun)\n",
offset, offset,
optdata->ligatureTable + optdata->ligatureTable_length optdata->ligatureTable + optdata->ligatureTable_length
- offset * 2 )); - offset * 2 ));

6
src/gxvalid/gxvmorx.c
View File

@ -84,7 +84,7 @@
p += 4; p += 4;
#endif #endif
GXV_TRACE(( "validating chain subtable %d/%d (%d bytes)\n", GXV_TRACE(( "validating chain subtable %d/%d (%lu bytes)\n",
i + 1, nSubtables, length )); i + 1, nSubtables, length ));
type = coverage & 0x0007; type = coverage & 0x0007;
@ -99,7 +99,7 @@
func = fmt_funcs_table[type]; func = fmt_funcs_table[type];
if ( !func ) if ( !func )
GXV_TRACE(( "morx type %d is reserved\n", type )); GXV_TRACE(( "morx type %lu is reserved\n", type ));
func( p, p + rest, gxvalid ); func( p, p + rest, gxvalid );
@ -186,7 +186,7 @@
for ( i = 0; i < nChains; i++ ) for ( i = 0; i < nChains; i++ )
{ {
GXV_TRACE(( "validating chain %d/%d\n", i + 1, nChains )); GXV_TRACE(( "validating chain %lu/%lu\n", i + 1, nChains ));
GXV_32BIT_ALIGNMENT_VALIDATE( p - table ); GXV_32BIT_ALIGNMENT_VALIDATE( p - table );
gxv_morx_chain_validate( p, limit, gxvalid ); gxv_morx_chain_validate( p, limit, gxvalid );
p += gxvalid->subtable_length; p += gxvalid->subtable_length;

28
src/gxvalid/gxvmorx2.c
View File

@ -72,11 +72,11 @@
optdata->componentTable = FT_NEXT_ULONG( p ); optdata->componentTable = FT_NEXT_ULONG( p );
optdata->ligatureTable = FT_NEXT_ULONG( p ); optdata->ligatureTable = FT_NEXT_ULONG( p );
GXV_TRACE(( "offset to ligActionTable=0x%08x\n", GXV_TRACE(( "offset to ligActionTable=0x%08lx\n",
optdata->ligActionTable )); optdata->ligActionTable ));
GXV_TRACE(( "offset to componentTable=0x%08x\n", GXV_TRACE(( "offset to componentTable=0x%08lx\n",
optdata->componentTable )); optdata->componentTable ));
GXV_TRACE(( "offset to ligatureTable=0x%08x\n", GXV_TRACE(( "offset to ligatureTable=0x%08lx\n",
optdata->ligatureTable )); optdata->ligatureTable ));
} }
@ -116,19 +116,19 @@
gxv_set_length_by_ulong_offset( o, l, buff, 6, table_size, gxvalid ); gxv_set_length_by_ulong_offset( o, l, buff, 6, table_size, gxvalid );
GXV_TRACE(( "classTable: offset=0x%08x length=0x%08x\n", GXV_TRACE(( "classTable: offset=0x%08lx length=0x%08lx\n",
classTable, *classTable_length_p )); classTable, *classTable_length_p ));
GXV_TRACE(( "stateArray: offset=0x%08x length=0x%08x\n", GXV_TRACE(( "stateArray: offset=0x%08lx length=0x%08lx\n",
stateArray, *stateArray_length_p )); stateArray, *stateArray_length_p ));
GXV_TRACE(( "entryTable: offset=0x%08x length=0x%08x\n", GXV_TRACE(( "entryTable: offset=0x%08lx length=0x%08lx\n",
entryTable, *entryTable_length_p )); entryTable, *entryTable_length_p ));
GXV_TRACE(( "ligActionTable: offset=0x%08x length=0x%08x\n", GXV_TRACE(( "ligActionTable: offset=0x%08lx length=0x%08lx\n",
optdata->ligActionTable, optdata->ligActionTable,
optdata->ligActionTable_length )); optdata->ligActionTable_length ));
GXV_TRACE(( "componentTable: offset=0x%08x length=0x%08x\n", GXV_TRACE(( "componentTable: offset=0x%08lx length=0x%08lx\n",
optdata->componentTable, optdata->componentTable,
optdata->componentTable_length )); optdata->componentTable_length ));
GXV_TRACE(( "ligatureTable: offset=0x%08x length=0x%08x\n", GXV_TRACE(( "ligatureTable: offset=0x%08lx length=0x%08lx\n",
optdata->ligatureTable, optdata->ligatureTable,
optdata->ligatureTable_length )); optdata->ligatureTable_length ));
@ -157,12 +157,12 @@
if ( p < lat_base ) if ( p < lat_base )
{ {
GXV_TRACE(( "p < lat_base (%d byte rewind)\n", lat_base - p )); GXV_TRACE(( "p < lat_base (%ld byte rewind)\n", lat_base - p ));
FT_INVALID_OFFSET; FT_INVALID_OFFSET;
} }
else if ( lat_limit < p ) else if ( lat_limit < p )
{ {
GXV_TRACE(( "lat_limit < p (%d byte overrun)\n", p - lat_limit )); GXV_TRACE(( "lat_limit < p (%ld byte overrun)\n", p - lat_limit ));
FT_INVALID_OFFSET; FT_INVALID_OFFSET;
} }
@ -196,7 +196,7 @@
GXV_TRACE(( "ligature action table includes" GXV_TRACE(( "ligature action table includes"
" too negative offset moving all GID" " too negative offset moving all GID"
" below defined range: 0x%04x\n", " below defined range: 0x%04lx\n",
offset & 0xFFFFU )); offset & 0xFFFFU ));
GXV_SET_ERR_IF_PARANOID( FT_INVALID_OFFSET ); GXV_SET_ERR_IF_PARANOID( FT_INVALID_OFFSET );
} }
@ -207,14 +207,14 @@
GXV_TRACE(( "ligature action table includes" GXV_TRACE(( "ligature action table includes"
" too large offset moving all GID" " too large offset moving all GID"
" over defined range: 0x%04x\n", " over defined range: 0x%04lx\n",
offset & 0xFFFFU )); offset & 0xFFFFU ));
GXV_SET_ERR_IF_PARANOID( FT_INVALID_OFFSET ); GXV_SET_ERR_IF_PARANOID( FT_INVALID_OFFSET );
} }
GXV_TRACE(( "ligature action table includes" GXV_TRACE(( "ligature action table includes"
" invalid offset to add to 16-bit GID:" " invalid offset to add to 16-bit GID:"
" 0x%08x\n", offset )); " 0x%08lx\n", offset ));
GXV_SET_ERR_IF_PARANOID( FT_INVALID_OFFSET ); GXV_SET_ERR_IF_PARANOID( FT_INVALID_OFFSET );
} }
} }

2
src/gxvalid/gxvopbd.c
View File

@ -188,7 +188,7 @@
/* only 0x00010000 is defined (1996) */ /* only 0x00010000 is defined (1996) */
GXV_TRACE(( "(version=0x%08x)\n", version )); GXV_TRACE(( "(version=0x%08lx)\n", version ));
if ( 0x00010000UL != version ) if ( 0x00010000UL != version )
FT_INVALID_FORMAT; FT_INVALID_FORMAT;

4
src/gxvalid/gxvprop.c
View File

@ -283,7 +283,7 @@
format = FT_NEXT_USHORT( p ); format = FT_NEXT_USHORT( p );
defaultProp = FT_NEXT_USHORT( p ); defaultProp = FT_NEXT_USHORT( p );
GXV_TRACE(( " version 0x%08x\n", version )); GXV_TRACE(( " version 0x%08lx\n", version ));
GXV_TRACE(( " format 0x%04x\n", format )); GXV_TRACE(( " format 0x%04x\n", format ));
GXV_TRACE(( " defaultProp 0x%04x\n", defaultProp )); GXV_TRACE(( " defaultProp 0x%04x\n", defaultProp ));
@ -309,7 +309,7 @@
if ( format == 0 ) if ( format == 0 )
{ {
FT_TRACE3(( "(format 0, no per-glyph properties, " FT_TRACE3(( "(format 0, no per-glyph properties, "
"remaining %d bytes are skipped)", limit - p )); "remaining %ld bytes are skipped)", limit - p ));
goto Exit; goto Exit;
} }

4
src/gxvalid/gxvtrak.c
View File

@ -130,7 +130,7 @@
p = table + j * ( 4 + 2 + 2 ); p = table + j * ( 4 + 2 + 2 );
t = FT_NEXT_LONG( p ); t = FT_NEXT_LONG( p );
if ( t == track ) if ( t == track )
GXV_TRACE(( "duplicated entries found for track value 0x%x\n", GXV_TRACE(( "duplicated entries found for track value 0x%lx\n",
track )); track ));
} }
} }
@ -243,7 +243,7 @@
vertOffset = FT_NEXT_USHORT( p ); vertOffset = FT_NEXT_USHORT( p );
reserved = FT_NEXT_USHORT( p ); reserved = FT_NEXT_USHORT( p );
GXV_TRACE(( " (version = 0x%08x)\n", version )); GXV_TRACE(( " (version = 0x%08lx)\n", version ));
GXV_TRACE(( " (format = 0x%04x)\n", format )); GXV_TRACE(( " (format = 0x%04x)\n", format ));
GXV_TRACE(( " (horizOffset = 0x%04x)\n", horizOffset )); GXV_TRACE(( " (horizOffset = 0x%04x)\n", horizOffset ));
GXV_TRACE(( " (vertOffset = 0x%04x)\n", vertOffset )); GXV_TRACE(( " (vertOffset = 0x%04x)\n", vertOffset ));

20
src/otvalid/otvcommn.h
View File

@ -180,24 +180,24 @@ FT_BEGIN_HEADER
#define OTV_ENTER \ #define OTV_ENTER \
FT_BEGIN_STMNT \ FT_BEGIN_STMNT \
otvalid->debug_indent += 2; \ otvalid->debug_indent += 2; \
FT_TRACE4(( "%*.s", otvalid->debug_indent, 0 )); \ FT_TRACE4(( "%*.s", otvalid->debug_indent, "" )); \
FT_TRACE4(( "%s table\n", \ FT_TRACE4(( "%s table\n", \
otvalid->debug_function_name[otvalid->nesting_level] )); \ otvalid->debug_function_name[otvalid->nesting_level] )); \
FT_END_STMNT FT_END_STMNT
#define OTV_NAME_ENTER( name ) \ #define OTV_NAME_ENTER( name ) \
FT_BEGIN_STMNT \ FT_BEGIN_STMNT \
otvalid->debug_indent += 2; \ otvalid->debug_indent += 2; \
FT_TRACE4(( "%*.s", otvalid->debug_indent, 0 )); \ FT_TRACE4(( "%*.s", otvalid->debug_indent, "" )); \
FT_TRACE4(( "%s table\n", name )); \ FT_TRACE4(( "%s table\n", name )); \
FT_END_STMNT FT_END_STMNT
#define OTV_EXIT otvalid->debug_indent -= 2 #define OTV_EXIT otvalid->debug_indent -= 2
#define OTV_TRACE( s ) \ #define OTV_TRACE( s ) \
FT_BEGIN_STMNT \ FT_BEGIN_STMNT \
FT_TRACE4(( "%*.s", otvalid->debug_indent, 0 )); \ FT_TRACE4(( "%*.s", otvalid->debug_indent, "" )); \
FT_TRACE4( s ); \ FT_TRACE4( s ); \
FT_END_STMNT FT_END_STMNT
#else /* !FT_DEBUG_LEVEL_TRACE */ #else /* !FT_DEBUG_LEVEL_TRACE */

2
src/otvalid/otvmod.c
View File

@ -94,7 +94,7 @@
*/ */
if ( face->num_glyphs > 0xFFFFL ) if ( face->num_glyphs > 0xFFFFL )
{ {
FT_TRACE1(( "otv_validate: Invalid glyphs index (0x0000FFFF - 0x%08x) ", FT_TRACE1(( "otv_validate: Invalid glyphs index (0x0000FFFF - 0x%08lx) ",
face->num_glyphs )); face->num_glyphs ));
FT_TRACE1(( "are not handled by OpenType tables\n" )); FT_TRACE1(( "are not handled by OpenType tables\n" ));
num_glyphs = 0xFFFF; num_glyphs = 0xFFFF;