fdo-mirrors/freetype
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/freetype/freetype.git synced 2026-05-08 17:28:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

*/*: Fix trivial signedness issues with format strings in trace messages.

Browse source 
As reported with clang 19's `-Wformat` option.
This commit is contained in:
Werner Lemberg 2025-07-01 17:08:37 +02:00
parent 346d8fae7a
commit 8d82c9fa4d
51 changed files with 253 additions and 253 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/autofit/afadjust.c
View file

@ -1504,7 +1504,7 @@
#endif /* FT_CONFIG_OPTION_USE_HARFBUZZ */
FT_TRACE4(( " reverse character map built successfully"
" with %d entries\n", ( *map )->used ));
" with %u entries\n", ( *map )->used ));
#ifdef FT_DEBUG_LEVEL_TRACE
@ -1570,7 +1570,7 @@
}
}
FT_TRACE7(( " %5d 0x%04X %s\n", cnt, codepoint, flag_str ));
FT_TRACE7(( " %5u 0x%04X %s\n", cnt, codepoint, flag_str ));
}
}

6
src/autofit/afcjk.c
View file

@ -147,7 +147,7 @@
if ( !glyph_index )
goto Exit;
FT_TRACE5(( "standard character: U+%04lX (glyph index %ld)\n",
FT_TRACE5(( "standard character: U+%04lX (glyph index %lu)\n",
ch, glyph_index ));
error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE );
@ -330,7 +330,7 @@
};
FT_TRACE5(( "blue zone %d (%s):\n",
FT_TRACE5(( "blue zone %u (%s):\n",
axis->blue_count,
cjk_blue_name[AF_CJK_IS_HORIZ_BLUE( bs ) |
AF_CJK_IS_TOP_BLUE( bs ) ] ));
@ -723,7 +723,7 @@
blue->shoot.fit = blue->ref.fit - delta2;
FT_TRACE5(( ">> active cjk blue zone %c%d[%ld/%ld]:\n",
FT_TRACE5(( ">> active cjk blue zone %c%u[%ld/%ld]:\n",
( dim == AF_DIMENSION_HORZ ) ? 'H' : 'V',
nn, blue->ref.org, blue->shoot.org ));
FT_TRACE5(( " ref: cur=%.2f fit=%.2f\n",

2
src/autofit/afglobal.c
View file

@ -306,7 +306,7 @@
if ( !( count % 10 ) )
FT_TRACE4(( " " ));
FT_TRACE4(( " %d", idx ));
FT_TRACE4(( " %u", idx ));
count++;
if ( !( count % 10 ) )

12
src/autofit/aflatin.c
View file

@ -146,7 +146,7 @@
goto Exit;
}
FT_TRACE5(( "standard character: U+%04lX (glyph index %ld)\n",
FT_TRACE5(( "standard character: U+%04lX (glyph index %lu)\n",
ch, glyph_index ));
error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE );
@ -359,7 +359,7 @@
FT_Bool have_flag = 0;
FT_TRACE5(( "blue zone %d", axis->blue_count ));
FT_TRACE5(( "blue zone %u", axis->blue_count ));
if ( bs->properties )
{
@ -493,7 +493,7 @@
if ( num_idx == 1 )
FT_TRACE5(( " U+%04lX contains no (usable) outlines\n", ch ));
else
FT_TRACE5(( " component %d of cluster starting with U+%04lX"
FT_TRACE5(( " component %u of cluster starting with U+%04lX"
" contains no (usable) outlines\n", i, ch ));
#endif
continue;
@ -831,7 +831,7 @@
if ( num_idx == 1 )
FT_TRACE5(( " U+%04lX: best_y = %5ld", ch, best_y ));
else
FT_TRACE5(( " component %d of cluster starting with U+%04lX:"
FT_TRACE5(( " component %u of cluster starting with U+%04lX:"
" best_y = %5ld", i, ch, best_y ));
#endif
@ -1476,13 +1476,13 @@
AF_LatinBlue blue = &axis->blues[nn];
FT_TRACE5(( " reference %d: %ld scaled to %.2f%s\n",
FT_TRACE5(( " reference %u: %ld scaled to %.2f%s\n",
nn,
blue->ref.org,
(double)blue->ref.fit / 64,
( blue->flags & AF_LATIN_BLUE_ACTIVE ) ? ""
: " (inactive)" ));
FT_TRACE5(( " overshoot %d: %ld scaled to %.2f%s\n",
FT_TRACE5(( " overshoot %u: %ld scaled to %.2f%s\n",
nn,
blue->shoot.org,
(double)blue->shoot.fit / 64,

2
src/autofit/afmodule.c
View file

@ -146,7 +146,7 @@
if ( !af_style_classes[ss] )
{
FT_TRACE2(( "af_property_set: Invalid value %d for property `%s'\n",
FT_TRACE2(( "af_property_set: Invalid value %u for property `%s'\n",
*fallback_script, property_name ));
return FT_THROW( Invalid_Argument );
}

6
src/autofit/afshaper.c
View file

@ -194,7 +194,7 @@
for ( idx = HB_SET_VALUE_INVALID; hb( set_next )( gsub_lookups, &idx ); )
{
#ifdef FT_DEBUG_LEVEL_TRACE
FT_TRACE4(( " %d", idx ));
FT_TRACE4(( " %u", idx ));
count++;
#endif
@ -235,7 +235,7 @@
for ( idx = HB_SET_VALUE_INVALID; hb( set_next )( gpos_lookups, &idx ); )
{
#ifdef FT_DEBUG_LEVEL_TRACE
FT_TRACE4(( " %d", idx ));
FT_TRACE4(( " %u", idx ));
count++;
#endif
@ -369,7 +369,7 @@
FT_TRACE4(( " " ));
}
FT_TRACE4(( " %d", idx ));
FT_TRACE4(( " %u", idx ));
count++;
#endif

10
src/base/ftbitmap.c
View file

@ -876,13 +876,13 @@
#ifdef FT_DEBUG_LEVEL_TRACE
FT_TRACE5(( "FT_Bitmap_Blend:\n" ));
FT_TRACE5(( " source bitmap: (%ld, %ld) -- (%ld, %ld); %d x %d\n",
FT_TRACE5(( " source bitmap: (%ld, %ld) -- (%ld, %ld); %u x %u\n",
source_llx / 64, source_lly / 64,
source_urx / 64, source_ury / 64,
source_->width, source_->rows ));
if ( target->width && target->rows )
FT_TRACE5(( " target bitmap: (%ld, %ld) -- (%ld, %ld); %d x %d\n",
FT_TRACE5(( " target bitmap: (%ld, %ld) -- (%ld, %ld); %u x %u\n",
target_llx / 64, target_lly / 64,
target_urx / 64, target_ury / 64,
target->width, target->rows ));
@ -890,7 +890,7 @@
FT_TRACE5(( " target bitmap: empty\n" ));
if ( final_width && final_rows )
FT_TRACE5(( " final bitmap: (%ld, %ld) -- (%ld, %ld); %d x %d\n",
FT_TRACE5(( " final bitmap: (%ld, %ld) -- (%ld, %ld); %u x %u\n",
final_llx / 64, final_lly / 64,
final_urx / 64, final_ury / 64,
final_width, final_rows ));
@ -924,7 +924,7 @@
if ( FT_LONG_MAX / target->pitch < (int)target->rows )
{
FT_TRACE5(( "FT_Blend_Bitmap: target bitmap too large (%d x %d)\n",
FT_TRACE5(( "FT_Blend_Bitmap: target bitmap too large (%u x %u)\n",
final_width, final_rows ));
return FT_THROW( Invalid_Argument );
}
@ -952,7 +952,7 @@
if ( FT_LONG_MAX / new_pitch < (int)final_rows )
{
FT_TRACE5(( "FT_Blend_Bitmap: target bitmap too large (%d x %d)\n",
FT_TRACE5(( "FT_Blend_Bitmap: target bitmap too large (%u x %u)\n",
final_width, final_rows ));
return FT_THROW( Invalid_Argument );
}

12
src/base/ftobjs.c
View file

@ -1170,9 +1170,9 @@
}
#ifdef FT_DEBUG_LEVEL_TRACE
FT_TRACE5(( "FT_Load_Glyph: index %d, flags 0x%x\n",
FT_TRACE5(( "FT_Load_Glyph: index %u, flags 0x%x\n",
glyph_index, load_flags ));
FT_TRACE5(( " bitmap %dx%d %s, %s (mode %d)\n",
FT_TRACE5(( " bitmap %ux%u %s, %s (mode %d)\n",
slot->bitmap.width,
slot->bitmap.rows,
slot->outline.points ?
@ -2111,7 +2111,7 @@
if ( pfb_pos > pfb_len || pfb_pos + rlen > pfb_len )
goto Exit2;
FT_TRACE3(( " Load POST fragment #%d (%ld byte) to buffer"
FT_TRACE3(( " Load POST fragment #%d (%lu byte) to buffer"
" %p + 0x%08lx\n",
i, rlen, (void*)pfb_data, pfb_pos ));
@ -2384,7 +2384,7 @@
is_darwin_vfs = ft_raccess_rule_by_darwin_vfs( library, i );
if ( is_darwin_vfs && vfs_rfork_has_no_font )
{
FT_TRACE3(( "Skip rule %d: darwin vfs resource fork"
FT_TRACE3(( "Skip rule %u: darwin vfs resource fork"
" is already checked and"
" no font is found\n",
i ));
@ -2393,7 +2393,7 @@
if ( errors[i] )
{
FT_TRACE3(( "Error 0x%x has occurred in rule %d\n",
FT_TRACE3(( "Error 0x%x has occurred in rule %u\n",
errors[i], i ));
continue;
}
@ -2401,7 +2401,7 @@
args2.flags = FT_OPEN_PATHNAME;
args2.pathname = file_names[i] ? file_names[i] : args->pathname;
FT_TRACE3(( "Try rule %d: %s (offset=%ld) ...",
FT_TRACE3(( "Try rule %u: %s (offset=%ld) ...",
i, args2.pathname, offsets[i] ));
error = FT_Stream_New( library, &args2, &stream2 );

2
src/base/ftstream.c
View file

@ -242,7 +242,7 @@
FT_ULong read_bytes;
FT_TRACE7(( "FT_Stream_EnterFrame: %ld bytes\n", count ));
FT_TRACE7(( "FT_Stream_EnterFrame: %lu bytes\n", count ));
/* check for nested frame access */
FT_ASSERT( stream && stream->cursor == 0 );

2
src/base/ftsystem.c
View file

@ -280,7 +280,7 @@
stream->close = ft_ansi_stream_close;
FT_TRACE1(( "FT_Stream_Open:" ));
FT_TRACE1(( " opened `%s' (%ld bytes) successfully\n",
FT_TRACE1(( " opened `%s' (%lu bytes) successfully\n",
filepathname, stream->size ));
return FT_Err_Ok;

12
src/bdf/bdfdrivr.c
View file

@ -389,10 +389,10 @@ THE SOFTWARE.
bdf_property_t* prop = NULL;
FT_TRACE4(( " number of glyphs: allocated %ld (used %ld)\n",
FT_TRACE4(( " number of glyphs: allocated %lu (used %lu)\n",
font->glyphs_size,
font->glyphs_used ));
FT_TRACE4(( " number of unencoded glyphs: allocated %ld (used %ld)\n",
FT_TRACE4(( " number of unencoded glyphs: allocated %lu (used %lu)\n",
font->unencoded_size,
font->unencoded_used ));
@ -621,7 +621,7 @@ THE SOFTWARE.
for ( n = 0; n < font->glyphs_size; n++ )
{
(bdfface->en_table[n]).enc = cur[n].encoding;
FT_TRACE4(( " idx %ld, val 0x%lX\n", n, cur[n].encoding ));
FT_TRACE4(( " idx %lu, val 0x%lX\n", n, cur[n].encoding ));
(bdfface->en_table[n]).glyph = (FT_UShort)n;
if ( cur[n].encoding == font->default_char )
@ -630,7 +630,7 @@ THE SOFTWARE.
bdfface->default_glyph = (FT_UInt)n;
else
FT_TRACE1(( "BDF_Face_Init:"
" idx %ld is too large for this system\n", n ));
" idx %lu is too large for this system\n", n ));
}
}
}
@ -817,7 +817,7 @@ THE SOFTWARE.
goto Exit;
}
FT_TRACE1(( "BDF_Glyph_Load: glyph index %d\n", glyph_index ));
FT_TRACE1(( "BDF_Glyph_Load: glyph index %u\n", glyph_index ));
/* index 0 is the undefined glyph */
if ( glyph_index == 0 )
@ -831,7 +831,7 @@ THE SOFTWARE.
bitmap->rows = glyph.bbx.height;
bitmap->width = glyph.bbx.width;
if ( glyph.bpr > FT_INT_MAX )
FT_TRACE1(( "BDF_Glyph_Load: too large pitch %ld is truncated\n",
FT_TRACE1(( "BDF_Glyph_Load: too large pitch %lu is truncated\n",
glyph.bpr ));
bitmap->pitch = (int)glyph.bpr; /* same as FT_Bitmap.pitch */

28
src/bdf/bdflib.c
View file

@ -162,28 +162,28 @@
#define ACMSG6 "Font descent != actual descent. Old: %d New: %d.\n"
#define ACMSG7 "Font height != actual height. Old: %d New: %d.\n"
#define ACMSG8 "Glyph scalable width (SWIDTH) adjustments made.\n"
#define ACMSG9 "SWIDTH field missing at line %ld. Set automatically.\n"
#define ACMSG10 "DWIDTH field missing at line %ld. Set to glyph width.\n"
#define ACMSG9 "SWIDTH field missing at line %lu. Set automatically.\n"
#define ACMSG10 "DWIDTH field missing at line %lu. Set to glyph width.\n"
#define ACMSG11 "SIZE bits per pixel field adjusted to %hd.\n"
#define ACMSG13 "Glyph %lu extra rows removed.\n"
#define ACMSG14 "Glyph %lu extra columns removed.\n"
#define ACMSG15 "Incorrect glyph count: %ld indicated but %ld found.\n"
#define ACMSG15 "Incorrect glyph count: %lu indicated but %lu found.\n"
#define ACMSG16 "Glyph %lu missing columns padded with zero bits.\n"
#define ACMSG17 "Adjusting number of glyphs to %ld.\n"
#define ACMSG17 "Adjusting number of glyphs to %lu.\n"
/* Error messages. */
#define ERRMSG1 "[line %ld] Missing `%s' line.\n"
#define ERRMSG2 "[line %ld] Font header corrupted or missing fields.\n"
#define ERRMSG3 "[line %ld] Font glyphs corrupted or missing fields.\n"
#define ERRMSG4 "[line %ld] BBX too big.\n"
#define ERRMSG5 "[line %ld] `%s' value too big.\n"
#define ERRMSG6 "[line %ld] Input line too long.\n"
#define ERRMSG7 "[line %ld] Font name too long.\n"
#define ERRMSG8 "[line %ld] Invalid `%s' value.\n"
#define ERRMSG9 "[line %ld] Invalid keyword.\n"
#define ERRMSG1 "[line %lu] Missing `%s' line.\n"
#define ERRMSG2 "[line %lu] Font header corrupted or missing fields.\n"
#define ERRMSG3 "[line %lu] Font glyphs corrupted or missing fields.\n"
#define ERRMSG4 "[line %lu] BBX too big.\n"
#define ERRMSG5 "[line %lu] `%s' value too big.\n"
#define ERRMSG6 "[line %lu] Input line too long.\n"
#define ERRMSG7 "[line %lu] Font name too long.\n"
#define ERRMSG8 "[line %lu] Invalid `%s' value.\n"
#define ERRMSG9 "[line %lu] Invalid keyword.\n"
/* Debug messages. */
#define DBGMSG1 " [%6ld] %s" /* no \n */
#define DBGMSG1 " [%6lu] %s" /* no \n */
#define DBGMSG2 " (0x%lX)\n"

4
src/cff/cffdrivr.c
View file

@ -168,7 +168,7 @@
CFF_Size cffsize = (CFF_Size)size;
FT_TRACE1(( "cff_glyph_load: glyph index %d\n", glyph_index ));
FT_TRACE1(( "cff_glyph_load: glyph index %u\n", glyph_index ));
/* now load the glyph outline if necessary */
error = cff_slot_load( cffslot, cffsize, glyph_index, load_flags );
@ -242,7 +242,7 @@
&dummy,
&aw );
FT_TRACE5(( " idx %d: advance %s %d font unit%s\n",
FT_TRACE5(( " idx %u: advance %s %d font unit%s\n",
start + nn,
horz ? "width" : "height",
aw,

14
src/cff/cffload.c
View file

@ -442,7 +442,7 @@
if ( cur_offset != 0 )
{
FT_TRACE0(( "cff_index_get_pointers:"
" invalid first offset value %ld set to zero\n",
" invalid first offset value %lu set to zero\n",
cur_offset ));
cur_offset = 0;
}
@ -559,8 +559,8 @@
idx->data_offset > stream->size - off2 + 1 )
{
FT_ERROR(( "cff_index_access_element:"
" offset to next entry (%ld)"
" exceeds the end of stream (%ld)\n",
" offset to next entry (%lu)"
" exceeds the end of stream (%lu)\n",
off2, stream->size - idx->data_offset + 1 ));
off2 = stream->size - idx->data_offset + 1;
}
@ -982,7 +982,7 @@
if ( glyph_sid > 0xFFFFL - nleft )
{
FT_ERROR(( "cff_charset_load: invalid SID range trimmed"
" nleft=%d -> %ld\n", nleft, 0xFFFFL - glyph_sid ));
" nleft=%u -> %ld\n", nleft, 0xFFFFL - glyph_sid ));
nleft = ( FT_UInt )( 0xFFFFL - glyph_sid );
}
@ -1315,7 +1315,7 @@
if ( numOperands > count )
{
FT_TRACE4(( " cff_blend_doBlend: Stack underflow %d argument%s\n",
FT_TRACE4(( " cff_blend_doBlend: Stack underflow %u argument%s\n",
count,
count == 1 ? "" : "s" ));
@ -1466,7 +1466,7 @@
if ( master == 0 )
{
blend->BV[master] = FT_FIXED_ONE;
FT_TRACE4(( " build blend vector len %d\n", len ));
FT_TRACE4(( " build blend vector len %u\n", len ));
FT_TRACE4(( " [ %f ", blend->BV[master] / 65536.0 ));
continue;
}
@ -2341,7 +2341,7 @@
if ( face_index > 0 && subfont_index >= font->name_index.count )
{
FT_ERROR(( "cff_font_load:"
" invalid subfont index for pure CFF font (%d)\n",
" invalid subfont index for pure CFF font (%u)\n",
subfont_index ));
error = FT_THROW( Invalid_Argument );
goto Exit;

6
src/cff/cffobjs.c
View file

@ -653,7 +653,7 @@
{
s = cff_index_get_sid_string( cff, idx );
if ( s )
FT_TRACE4(( " %5d %s\n", idx, s ));
FT_TRACE4(( " %5u %s\n", idx, s ));
}
/* In Multiple Master CFFs, two SIDs hold the Normalize Design */
@ -668,7 +668,7 @@
FT_PtrDist l;
FT_TRACE4(( " %5d ", idx + 390 ));
FT_TRACE4(( " %5u ", idx + 390 ));
for ( l = 0; l < s1len; l++ )
FT_TRACE4(( "%c", s1[l] ));
FT_TRACE4(( "\n" ));
@ -683,7 +683,7 @@
FT_PtrDist l;
FT_TRACE4(( " %5d ", cff->num_strings + 390 ));
FT_TRACE4(( " %5u ", cff->num_strings + 390 ));
for ( l = 0; l < s1len; l++ )
FT_TRACE4(( "%c", s1[l] ));
FT_TRACE4(( "\n" ));

8
src/cff/cffparse.c
View file

@ -892,7 +892,7 @@
dict->cid_supplement ));
error = FT_Err_Ok;
FT_TRACE4(( " %d %d %ld\n",
FT_TRACE4(( " %u %u %ld\n",
dict->cid_registry,
dict->cid_ordering,
dict->cid_supplement ));
@ -929,7 +929,7 @@
priv->vsindex = (FT_UInt)cff_parse_num( parser, data++ );
FT_TRACE4(( " %d\n", priv->vsindex ));
FT_TRACE4(( " %u\n", priv->vsindex ));
error = FT_Err_Ok;
@ -979,7 +979,7 @@
goto Exit;
}
FT_TRACE4(( " %d value%s blended\n",
FT_TRACE4(( " %u value%s blended\n",
numBlends,
numBlends == 1 ? "" : "s" ));
@ -1014,7 +1014,7 @@
if ( dict->maxstack < CFF2_DEFAULT_STACK )
dict->maxstack = CFF2_DEFAULT_STACK;
FT_TRACE4(( " %d\n", dict->maxstack ));
FT_TRACE4(( " %u\n", dict->maxstack ));
Exit:
return error;

20
src/cid/cidgload.c
View file

@ -103,20 +103,20 @@
if ( ( cid->fd_bytes == 1 && fd_select == 0xFFU ) ||
( cid->fd_bytes == 2 && fd_select == 0xFFFFU ) )
{
FT_TRACE1(( "cid_load_glyph: fail for glyph index %d:\n",
FT_TRACE1(( "cid_load_glyph: fail for glyph index %u:\n",
glyph_index ));
FT_TRACE1(( " FD number %ld is the maximum\n",
FT_TRACE1(( " FD number %lu is the maximum\n",
fd_select ));
FT_TRACE1(( " integer fitting into %d byte%s\n",
FT_TRACE1(( " integer fitting into %u byte%s\n",
cid->fd_bytes, cid->fd_bytes == 1 ? "" : "s" ));
}
else
{
FT_TRACE0(( "cid_load_glyph: fail for glyph index %d:\n",
FT_TRACE0(( "cid_load_glyph: fail for glyph index %u:\n",
glyph_index ));
FT_TRACE0(( " FD number %ld is larger\n",
FT_TRACE0(( " FD number %lu is larger\n",
fd_select ));
FT_TRACE0(( " than number of dictionaries (%d)\n",
FT_TRACE0(( " than number of dictionaries (%u)\n",
cid->num_dicts ));
}
@ -125,7 +125,7 @@
}
else if ( off2 > stream->size )
{
FT_TRACE0(( "cid_load_glyph: fail for glyph index %d:\n",
FT_TRACE0(( "cid_load_glyph: fail for glyph index %u:\n",
glyph_index ));
FT_TRACE0(( " end of the glyph data\n" ));
FT_TRACE0(( " is beyond the data stream\n" ));
@ -135,7 +135,7 @@
}
else if ( off1 > off2 )
{
FT_TRACE0(( "cid_load_glyph: fail for glyph index %d:\n",
FT_TRACE0(( "cid_load_glyph: fail for glyph index %u:\n",
glyph_index ));
FT_TRACE0(( " the end position of glyph data\n" ));
FT_TRACE0(( " is set before the start position\n" ));
@ -252,8 +252,8 @@
cs_offset = decoder->lenIV >= 0 ? (FT_UInt)decoder->lenIV : 0;
if ( cs_offset > glyph_length )
{
FT_TRACE0(( "cid_load_glyph: fail for glyph_index=%d, "
"offset to the charstring is beyond glyph length\n",
FT_TRACE0(( "cid_load_glyph: fail for glyph_index=%u,"
" offset to the charstring is beyond glyph length\n",
glyph_index ));
error = FT_THROW( Invalid_Offset );
goto Exit;

2
src/gxvalid/gxvcommn.c
View file

@ -1730,7 +1730,7 @@
{
#ifdef FT_DEBUG_LEVEL_TRACE
if ( odtect->range[i].name || odtect->range[j].name )
GXV_TRACE(( "found overlap between range %d and range %d\n",
GXV_TRACE(( "found overlap between range %u and range %u\n",
i, j ));
else
GXV_TRACE(( "found overlap between `%s' and `%s\'\n",

2
src/gxvalid/gxvfeat.c
View file

@ -306,7 +306,7 @@
FT_INVALID_FORMAT;
featureNameCount = FT_NEXT_USHORT( p );
GXV_TRACE(( " (featureNameCount = %d)\n", featureNameCount ));
GXV_TRACE(( " (featureNameCount = %u)\n", featureNameCount ));
if ( !( IS_PARANOID_VALIDATION ) )
p += 6; /* skip (none) and (none) */

2
src/gxvalid/gxvkern.c
View file

@ -884,7 +884,7 @@
for ( i = 0; i < nTables; i++ )
{
GXV_TRACE(( "validating subtable %d/%lu\n", i, nTables ));
GXV_TRACE(( "validating subtable %u/%lu\n", i, nTables ));
/* p should be 32bit-aligned? */
gxv_kern_subtable_validate( p, 0, gxvalid );
p += gxvalid->subtable_length;

2
src/gxvalid/gxvmort.c
View file

@ -207,7 +207,7 @@
func = fmt_funcs_table[type];
if ( !func )
GXV_TRACE(( "morx type %d is reserved\n", type ));
GXV_TRACE(( "morx type %u is reserved\n", type ));
func( p, p + rest, gxvalid );

12
src/otvalid/otvbase.c
View file

@ -44,7 +44,7 @@
BaseCoordFormat = FT_NEXT_USHORT( p );
p += 2; /* skip Coordinate */
OTV_TRACE(( " (format %d)\n", BaseCoordFormat ));
OTV_TRACE(( " (format %u)\n", BaseCoordFormat ));
switch ( BaseCoordFormat )
{
@ -83,7 +83,7 @@
BaseTagCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (BaseTagCount = %d)\n", BaseTagCount ));
OTV_TRACE(( " (BaseTagCount = %u)\n", BaseTagCount ));
OTV_LIMIT_CHECK( BaseTagCount * 4 ); /* BaselineTag */
@ -106,7 +106,7 @@
p += 2; /* skip DefaultIndex */
BaseCoordCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (BaseCoordCount = %d)\n", BaseCoordCount ));
OTV_TRACE(( " (BaseCoordCount = %u)\n", BaseCoordCount ));
OTV_LIMIT_CHECK( BaseCoordCount * 2 );
@ -138,7 +138,7 @@
OTV_OPTIONAL_OFFSET( MaxCoord );
FeatMinMaxCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (FeatMinMaxCount = %d)\n", FeatMinMaxCount ));
OTV_TRACE(( " (FeatMinMaxCount = %u)\n", FeatMinMaxCount ));
table_size = FeatMinMaxCount * 8 + 6;
@ -192,7 +192,7 @@
OTV_OPTIONAL_OFFSET( DefaultMinMax );
BaseLangSysCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (BaseLangSysCount = %d)\n", BaseLangSysCount ));
OTV_TRACE(( " (BaseLangSysCount = %u)\n", BaseLangSysCount ));
table_size = BaseLangSysCount * 6 + 6;
@ -231,7 +231,7 @@
OTV_LIMIT_CHECK( 2 );
BaseScriptCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (BaseScriptCount = %d)\n", BaseScriptCount ));
OTV_TRACE(( " (BaseScriptCount = %u)\n", BaseScriptCount ));
OTV_LIMIT_CHECK( BaseScriptCount * 6 );

64
src/otvalid/otvcommn.c
View file

@ -52,7 +52,7 @@
OTV_LIMIT_CHECK( 4 );
CoverageFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format %d)\n", CoverageFormat ));
OTV_TRACE(( " (format %u)\n", CoverageFormat ));
switch ( CoverageFormat )
{
@ -64,7 +64,7 @@
GlyphCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (GlyphCount = %d)\n", GlyphCount ));
OTV_TRACE(( " (GlyphCount = %u)\n", GlyphCount ));
OTV_LIMIT_CHECK( GlyphCount * 2 ); /* GlyphArray */
@ -90,7 +90,7 @@
RangeCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (RangeCount = %d)\n", RangeCount ));
OTV_TRACE(( " (RangeCount = %u)\n", RangeCount ));
OTV_LIMIT_CHECK( RangeCount * 6 );
@ -233,7 +233,7 @@
OTV_LIMIT_CHECK( 4 );
ClassFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format %d)\n", ClassFormat ));
OTV_TRACE(( " (format %u)\n", ClassFormat ));
switch ( ClassFormat )
{
@ -248,7 +248,7 @@
StartGlyph = FT_NEXT_USHORT( p );
GlyphCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (GlyphCount = %d)\n", GlyphCount ));
OTV_TRACE(( " (GlyphCount = %u)\n", GlyphCount ));
OTV_LIMIT_CHECK( GlyphCount * 2 ); /* ClassValueArray */
@ -265,7 +265,7 @@
ClassRangeCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (ClassRangeCount = %d)\n", ClassRangeCount ));
OTV_TRACE(( " (ClassRangeCount = %u)\n", ClassRangeCount ));
OTV_LIMIT_CHECK( ClassRangeCount * 6 );
@ -368,14 +368,14 @@
LookupFlag = FT_NEXT_USHORT( p );
SubTableCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (type %d)\n", LookupType ));
OTV_TRACE(( " (type %u)\n", LookupType ));
if ( LookupType == 0 || LookupType > otvalid->type_count )
FT_INVALID_DATA;
validate = otvalid->type_funcs[LookupType - 1];
OTV_TRACE(( " (SubTableCount = %d)\n", SubTableCount ));
OTV_TRACE(( " (SubTableCount = %u)\n", SubTableCount ));
OTV_LIMIT_CHECK( SubTableCount * 2 );
@ -405,7 +405,7 @@
OTV_LIMIT_CHECK( 2 );
LookupCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (LookupCount = %d)\n", LookupCount ));
OTV_TRACE(( " (LookupCount = %u)\n", LookupCount ));
OTV_LIMIT_CHECK( LookupCount * 2 );
@ -450,7 +450,7 @@
p += 2; /* skip FeatureParams (unused) */
LookupCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (LookupCount = %d)\n", LookupCount ));
OTV_TRACE(( " (LookupCount = %u)\n", LookupCount ));
OTV_LIMIT_CHECK( LookupCount * 2 );
@ -486,7 +486,7 @@
OTV_LIMIT_CHECK( 2 );
FeatureCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (FeatureCount = %d)\n", FeatureCount ));
OTV_TRACE(( " (FeatureCount = %u)\n", FeatureCount ));
OTV_LIMIT_CHECK( FeatureCount * 2 );
@ -532,8 +532,8 @@
ReqFeatureIndex = FT_NEXT_USHORT( p );
FeatureCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (ReqFeatureIndex = %d)\n", ReqFeatureIndex ));
OTV_TRACE(( " (FeatureCount = %d)\n", FeatureCount ));
OTV_TRACE(( " (ReqFeatureIndex = %u)\n", ReqFeatureIndex ));
OTV_TRACE(( " (FeatureCount = %u)\n", FeatureCount ));
if ( ReqFeatureIndex != 0xFFFFU && ReqFeatureIndex >= otvalid->extra1 )
FT_INVALID_DATA;
@ -571,7 +571,7 @@
DefaultLangSys = FT_NEXT_USHORT( p );
LangSysCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (LangSysCount = %d)\n", LangSysCount ));
OTV_TRACE(( " (LangSysCount = %u)\n", LangSysCount ));
if ( DefaultLangSys != 0 )
otv_LangSys_validate( table + DefaultLangSys, otvalid );
@ -607,7 +607,7 @@
OTV_LIMIT_CHECK( 2 );
ScriptCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (ScriptCount = %d)\n", ScriptCount ));
OTV_TRACE(( " (ScriptCount = %u)\n", ScriptCount ));
OTV_LIMIT_CHECK( ScriptCount * 6 );
@ -665,7 +665,7 @@
OTV_LIMIT_CHECK( 2 );
Count = FT_NEXT_USHORT( p );
OTV_TRACE(( " (Count = %d)\n", Count ));
OTV_TRACE(( " (Count = %u)\n", Count ));
OTV_LIMIT_CHECK( Count * 2 );
@ -698,7 +698,7 @@
Coverage = FT_NEXT_USHORT( p );
Count = FT_NEXT_USHORT( p );
OTV_TRACE(( " (Count = %d)\n", Count ));
OTV_TRACE(( " (Count = %u)\n", Count ));
otv_Coverage_validate( table + Coverage, otvalid, (FT_Int)Count );
@ -731,7 +731,7 @@
OTV_LIMIT_CHECK( 2 );
Count = FT_NEXT_USHORT( p );
OTV_TRACE(( " (Count = %d)\n", Count ));
OTV_TRACE(( " (Count = %u)\n", Count ));
OTV_LIMIT_CHECK( Count * 2 );
@ -765,8 +765,8 @@
Count1 = FT_NEXT_USHORT( p );
Count2 = FT_NEXT_USHORT( p );
OTV_TRACE(( " (Count1 = %d)\n", Count1 ));
OTV_TRACE(( " (Count2 = %d)\n", Count2 ));
OTV_TRACE(( " (Count1 = %u)\n", Count1 ));
OTV_TRACE(( " (Count2 = %u)\n", Count2 ));
if ( Count1 == 0 )
FT_INVALID_DATA;
@ -806,7 +806,7 @@
OTV_LIMIT_CHECK( 2 );
BacktrackCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (BacktrackCount = %d)\n", BacktrackCount ));
OTV_TRACE(( " (BacktrackCount = %u)\n", BacktrackCount ));
OTV_LIMIT_CHECK( BacktrackCount * 2 + 2 );
p += BacktrackCount * 2;
@ -815,21 +815,21 @@
if ( InputCount == 0 )
FT_INVALID_DATA;
OTV_TRACE(( " (InputCount = %d)\n", InputCount ));
OTV_TRACE(( " (InputCount = %u)\n", InputCount ));
OTV_LIMIT_CHECK( InputCount * 2 );
p += ( InputCount - 1 ) * 2;
LookaheadCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (LookaheadCount = %d)\n", LookaheadCount ));
OTV_TRACE(( " (LookaheadCount = %u)\n", LookaheadCount ));
OTV_LIMIT_CHECK( LookaheadCount * 2 + 2 );
p += LookaheadCount * 2;
Count = FT_NEXT_USHORT( p );
OTV_TRACE(( " (Count = %d)\n", Count ));
OTV_TRACE(( " (Count = %u)\n", Count ));
OTV_LIMIT_CHECK( Count * 4 );
@ -866,7 +866,7 @@
ClassDef = FT_NEXT_USHORT( p );
ClassSetCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (ClassSetCount = %d)\n", ClassSetCount ));
OTV_TRACE(( " (ClassSetCount = %u)\n", ClassSetCount ));
otv_Coverage_validate( table + Coverage, otvalid, -1 );
otv_ClassDef_validate( table + ClassDef, otvalid );
@ -910,8 +910,8 @@
GlyphCount = FT_NEXT_USHORT( p );
Count = FT_NEXT_USHORT( p );
OTV_TRACE(( " (GlyphCount = %d)\n", GlyphCount ));
OTV_TRACE(( " (Count = %d)\n", Count ));
OTV_TRACE(( " (GlyphCount = %u)\n", GlyphCount ));
OTV_TRACE(( " (Count = %u)\n", Count ));
OTV_LIMIT_CHECK( GlyphCount * 2 + Count * 4 );
@ -955,7 +955,7 @@
LookaheadClassDef = FT_NEXT_USHORT( p );
ChainClassSetCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (ChainClassSetCount = %d)\n", ChainClassSetCount ));
OTV_TRACE(( " (ChainClassSetCount = %u)\n", ChainClassSetCount ));
otv_Coverage_validate( table + Coverage, otvalid, -1 );
@ -1002,7 +1002,7 @@
OTV_LIMIT_CHECK( 2 );
BacktrackGlyphCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (BacktrackGlyphCount = %d)\n", BacktrackGlyphCount ));
OTV_TRACE(( " (BacktrackGlyphCount = %u)\n", BacktrackGlyphCount ));
OTV_LIMIT_CHECK( BacktrackGlyphCount * 2 + 2 );
@ -1011,7 +1011,7 @@
InputGlyphCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (InputGlyphCount = %d)\n", InputGlyphCount ));
OTV_TRACE(( " (InputGlyphCount = %u)\n", InputGlyphCount ));
OTV_LIMIT_CHECK( InputGlyphCount * 2 + 2 );
@ -1020,7 +1020,7 @@
LookaheadGlyphCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (LookaheadGlyphCount = %d)\n", LookaheadGlyphCount ));
OTV_TRACE(( " (LookaheadGlyphCount = %u)\n", LookaheadGlyphCount ));
OTV_LIMIT_CHECK( LookaheadGlyphCount * 2 + 2 );
@ -1029,7 +1029,7 @@
count2 = FT_NEXT_USHORT( p );
OTV_TRACE(( " (Count = %d)\n", count2 ));
OTV_TRACE(( " (Count = %u)\n", count2 ));
OTV_LIMIT_CHECK( count2 * 4 );

6
src/otvalid/otvgdef.c
View file

@ -59,7 +59,7 @@
Coverage = table + FT_NEXT_USHORT( p );
GlyphCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (GlyphCount = %d)\n", GlyphCount ));
OTV_TRACE(( " (GlyphCount = %u)\n", GlyphCount ));
otv_Coverage_validate( Coverage, otvalid, (FT_Int)GlyphCount );
if ( GlyphCount != otv_Coverage_get_count( Coverage ) )
@ -104,7 +104,7 @@
CaretValueFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format = %d)\n", CaretValueFormat ));
OTV_TRACE(( " (format = %u)\n", CaretValueFormat ));
switch ( CaretValueFormat )
{
@ -156,7 +156,7 @@
OTV_LIMIT_CHECK( 2 );
MarkGlyphSetCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (MarkGlyphSetCount = %d)\n", MarkGlyphSetCount ));
OTV_TRACE(( " (MarkGlyphSetCount = %u)\n", MarkGlyphSetCount ));
OTV_LIMIT_CHECK( MarkGlyphSetCount * 4 ); /* CoverageOffsets */

36
src/otvalid/otvgpos.c
View file

@ -69,7 +69,7 @@
Count = FT_NEXT_USHORT( p );
OTV_TRACE(( " (Count = %d)\n", Count ));
OTV_TRACE(( " (Count = %u)\n", Count ));
OTV_LIMIT_CHECK( Count * otvalid->extra1 * 2 );
@ -252,7 +252,7 @@
OTV_LIMIT_CHECK( 6 );
AnchorFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format %d)\n", AnchorFormat ));
OTV_TRACE(( " (format %u)\n", AnchorFormat ));
p += 4; /* skip XCoordinate and YCoordinate */
@ -318,7 +318,7 @@
OTV_LIMIT_CHECK( 2 );
MarkCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (MarkCount = %d)\n", MarkCount ));
OTV_TRACE(( " (MarkCount = %u)\n", MarkCount ));
OTV_LIMIT_CHECK( MarkCount * 4 );
@ -357,7 +357,7 @@
OTV_LIMIT_CHECK( 2 );
PosFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format %d)\n", PosFormat ));
OTV_TRACE(( " (format %u)\n", PosFormat ));
otvalid->extra3 = table;
@ -387,7 +387,7 @@
ValueFormat = FT_NEXT_USHORT( p );
ValueCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (ValueCount = %d)\n", ValueCount ));
OTV_TRACE(( " (ValueCount = %u)\n", ValueCount ));
len_value = otv_value_length( ValueFormat );
@ -441,7 +441,7 @@
OTV_LIMIT_CHECK( 2 );
PairValueCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (PairValueCount = %d)\n", PairValueCount ));
OTV_TRACE(( " (PairValueCount = %u)\n", PairValueCount ));
value_len1 = otv_value_length( format1 );
value_len2 = otv_value_length( format2 );
@ -481,7 +481,7 @@
OTV_LIMIT_CHECK( 2 );
PosFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format %d)\n", PosFormat ));
OTV_TRACE(( " (format %u)\n", PosFormat ));
switch ( PosFormat )
{
@ -496,7 +496,7 @@
ValueFormat2 = FT_NEXT_USHORT( p );
PairSetCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (PairSetCount = %d)\n", PairSetCount ));
OTV_TRACE(( " (PairSetCount = %u)\n", PairSetCount ));
otv_Coverage_validate( table + Coverage, otvalid, -1 );
@ -524,8 +524,8 @@
ClassCount1 = FT_NEXT_USHORT( p );
ClassCount2 = FT_NEXT_USHORT( p );
OTV_TRACE(( " (ClassCount1 = %d)\n", ClassCount1 ));
OTV_TRACE(( " (ClassCount2 = %d)\n", ClassCount2 ));
OTV_TRACE(( " (ClassCount1 = %u)\n", ClassCount1 ));
OTV_TRACE(( " (ClassCount2 = %u)\n", ClassCount2 ));
len_value1 = otv_value_length( ValueFormat1 );
len_value2 = otv_value_length( ValueFormat2 );
@ -588,7 +588,7 @@
OTV_LIMIT_CHECK( 2 );
PosFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format %d)\n", PosFormat ));
OTV_TRACE(( " (format %u)\n", PosFormat ));
switch ( PosFormat )
{
@ -605,7 +605,7 @@
Coverage = FT_NEXT_USHORT( p );
EntryExitCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (EntryExitCount = %d)\n", EntryExitCount ));
OTV_TRACE(( " (EntryExitCount = %u)\n", EntryExitCount ));
otv_Coverage_validate( table + Coverage,
otvalid,
@ -666,7 +666,7 @@
OTV_LIMIT_CHECK( 2 );
PosFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format %d)\n", PosFormat ));
OTV_TRACE(( " (format %u)\n", PosFormat ));
switch ( PosFormat )
{
@ -707,7 +707,7 @@
OTV_LIMIT_CHECK( 2 );
PosFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format %d)\n", PosFormat ));
OTV_TRACE(( " (format %u)\n", PosFormat ));
switch ( PosFormat )
{
@ -748,7 +748,7 @@
OTV_LIMIT_CHECK( 2 );
PosFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format %d)\n", PosFormat ));
OTV_TRACE(( " (format %u)\n", PosFormat ));
switch ( PosFormat )
{
@ -789,7 +789,7 @@
OTV_LIMIT_CHECK( 2 );
PosFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format %d)\n", PosFormat ));
OTV_TRACE(( " (format %u)\n", PosFormat ));
switch ( PosFormat )
{
@ -848,7 +848,7 @@
OTV_LIMIT_CHECK( 2 );
PosFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format %d)\n", PosFormat ));
OTV_TRACE(( " (format %u)\n", PosFormat ));
switch ( PosFormat )
{
@ -909,7 +909,7 @@
OTV_LIMIT_CHECK( 2 );
PosFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format %d)\n", PosFormat ));
OTV_TRACE(( " (format %u)\n", PosFormat ));
switch ( PosFormat )
{

26
src/otvalid/otvgsub.c
View file

@ -53,7 +53,7 @@
OTV_LIMIT_CHECK( 2 );
SubstFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format %d)\n", SubstFormat ));
OTV_TRACE(( " (format %u)\n", SubstFormat ));
switch ( SubstFormat )
{
@ -99,7 +99,7 @@
Coverage = FT_NEXT_USHORT( p );
GlyphCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (GlyphCount = %d)\n", GlyphCount ));
OTV_TRACE(( " (GlyphCount = %u)\n", GlyphCount ));
otv_Coverage_validate( table + Coverage,
otvalid,
@ -145,7 +145,7 @@
OTV_LIMIT_CHECK( 2 );
SubstFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format %d)\n", SubstFormat ));
OTV_TRACE(( " (format %u)\n", SubstFormat ));
switch ( SubstFormat )
{
@ -186,7 +186,7 @@
OTV_LIMIT_CHECK( 2 );
SubstFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format %d)\n", SubstFormat ));
OTV_TRACE(( " (format %u)\n", SubstFormat ));
switch ( SubstFormat )
{
@ -233,7 +233,7 @@
CompCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (CompCount = %d)\n", CompCount ));
OTV_TRACE(( " (CompCount = %u)\n", CompCount ));
if ( CompCount == 0 )
FT_INVALID_DATA;
@ -261,7 +261,7 @@
OTV_LIMIT_CHECK( 2 );
SubstFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format %d)\n", SubstFormat ));
OTV_TRACE(( " (format %u)\n", SubstFormat ));
switch ( SubstFormat )
{
@ -301,7 +301,7 @@
OTV_LIMIT_CHECK( 2 );
SubstFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format %d)\n", SubstFormat ));
OTV_TRACE(( " (format %u)\n", SubstFormat ));
switch ( SubstFormat )
{
@ -360,7 +360,7 @@
OTV_LIMIT_CHECK( 2 );
SubstFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format %d)\n", SubstFormat ));
OTV_TRACE(( " (format %u)\n", SubstFormat ));
switch ( SubstFormat )
{
@ -421,7 +421,7 @@
OTV_LIMIT_CHECK( 2 );
SubstFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format %d)\n", SubstFormat ));
OTV_TRACE(( " (format %u)\n", SubstFormat ));
switch ( SubstFormat )
{
@ -478,7 +478,7 @@
OTV_LIMIT_CHECK( 2 );
SubstFormat = FT_NEXT_USHORT( p );
OTV_TRACE(( " (format %d)\n", SubstFormat ));
OTV_TRACE(( " (format %u)\n", SubstFormat ));
switch ( SubstFormat )
{
@ -487,7 +487,7 @@
Coverage = table + FT_NEXT_USHORT( p );
BacktrackGlyphCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (BacktrackGlyphCount = %d)\n", BacktrackGlyphCount ));
OTV_TRACE(( " (BacktrackGlyphCount = %u)\n", BacktrackGlyphCount ));
otv_Coverage_validate( Coverage, otvalid, -1 );
@ -498,7 +498,7 @@
LookaheadGlyphCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (LookaheadGlyphCount = %d)\n", LookaheadGlyphCount ));
OTV_TRACE(( " (LookaheadGlyphCount = %u)\n", LookaheadGlyphCount ));
OTV_LIMIT_CHECK( LookaheadGlyphCount * 2 + 2 );
@ -507,7 +507,7 @@
GlyphCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (GlyphCount = %d)\n", GlyphCount ));
OTV_TRACE(( " (GlyphCount = %u)\n", GlyphCount ));
if ( GlyphCount != otv_Coverage_get_count( Coverage ) )
FT_INVALID_DATA;

4
src/otvalid/otvjstf.c
View file

@ -163,7 +163,7 @@
OTV_OPTIONAL_OFFSET( DefJstfLangSys );
JstfLangSysCount = FT_NEXT_USHORT( p );
OTV_TRACE(( " (JstfLangSysCount = %d)\n", JstfLangSysCount ));
OTV_TRACE(( " (JstfLangSysCount = %u)\n", JstfLangSysCount ));
table_size = JstfLangSysCount * 6 + 6;
@ -227,7 +227,7 @@
JstfScriptCount = FT_NEXT_USHORT( p );
FT_TRACE3(( " (JstfScriptCount = %d)\n", JstfScriptCount ));
FT_TRACE3(( " (JstfScriptCount = %u)\n", JstfScriptCount ));
OTV_LIMIT_CHECK( JstfScriptCount * 6 );

2
src/pcf/pcfdrivr.c
View file

@ -461,7 +461,7 @@ THE SOFTWARE.
FT_ULong bytes;
FT_TRACE1(( "PCF_Glyph_Load: glyph index %d\n", glyph_index ));
FT_TRACE1(( "PCF_Glyph_Load: glyph index %u\n", glyph_index ));
if ( !face )
{

20
src/pcf/pcfread.c
View file

@ -121,7 +121,7 @@ THE SOFTWARE.
toc->count > 9 )
{
FT_TRACE0(( "pcf_read_TOC: adjusting number of tables"
" (from %ld to %ld)\n",
" (from %lu to %lu)\n",
toc->count,
FT_MIN( stream->size >> 4, 9 ) ));
toc->count = FT_MIN( stream->size >> 4, 9 );
@ -231,7 +231,7 @@ THE SOFTWARE.
FT_TRACE4(( "pcf_read_TOC:\n" ));
FT_TRACE4(( " number of tables: %ld\n", face->toc.count ));
FT_TRACE4(( " number of tables: %lu\n", face->toc.count ));
tables = face->toc.tables;
for ( i = 0; i < toc->count; i++ )
@ -241,8 +241,8 @@ THE SOFTWARE.
if ( tables[i].type == 1UL << j )
name = tableNames[j];
FT_TRACE4(( " %d: type=%s, format=0x%lX,"
" size=%ld (0x%lX), offset=%ld (0x%lX)\n",
FT_TRACE4(( " %u: type=%s, format=0x%lX,"
" size=%lu (0x%lX), offset=%lu (0x%lX)\n",
i, name,
tables[i].format,
tables[i].size, tables[i].size,
@ -516,7 +516,7 @@ THE SOFTWARE.
if ( error )
goto Bail;
FT_TRACE4(( " number of properties: %ld\n", orig_nprops ));
FT_TRACE4(( " number of properties: %lu\n", orig_nprops ));
/* rough estimate */
if ( orig_nprops > size / PCF_PROPERTY_SIZE )
@ -588,7 +588,7 @@ THE SOFTWARE.
if ( error )
goto Bail;
FT_TRACE4(( " string size: %ld\n", string_size ));
FT_TRACE4(( " string size: %lu\n", string_size ));
/* rough estimate */
if ( string_size > size - orig_nprops * PCF_PROPERTY_SIZE )
@ -725,7 +725,7 @@ THE SOFTWARE.
if ( error )
return FT_THROW( Invalid_File_Format );
FT_TRACE4(( " number of metrics: %ld\n", orig_nmetrics ));
FT_TRACE4(( " number of metrics: %lu\n", orig_nmetrics ));
/* rough estimate */
if ( PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) )
@ -776,7 +776,7 @@ THE SOFTWARE.
FT_TRACE4(( "\n" ));
for ( i = 1; i < face->nmetrics; i++, metrics++ )
{
FT_TRACE5(( " idx %ld:", i ));
FT_TRACE5(( " idx %lu:", i ));
error = pcf_get_metric( stream, format, metrics );
metrics->bits = 0;
@ -797,7 +797,7 @@ THE SOFTWARE.
metrics->descent = 0;
FT_TRACE0(( "pcf_get_metrics:"
" invalid metrics for glyph %ld\n", i ));
" invalid metrics for glyph %lu\n", i ));
}
}
@ -858,7 +858,7 @@ THE SOFTWARE.
if ( !PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) )
return FT_THROW( Invalid_File_Format );
FT_TRACE4(( " number of bitmaps: %ld\n", orig_nbitmaps ));
FT_TRACE4(( " number of bitmaps: %lu\n", orig_nbitmaps ));
/* see comment in `pcf_get_metrics' */
if ( orig_nbitmaps > 65534 )

14
src/pfr/pfrgload.c
View file

@ -388,7 +388,7 @@
break;
case 2: /* horizontal line to */
FT_TRACE6(( "- horizontal line to cx.%d", format_low ));
FT_TRACE6(( "- horizontal line to cx.%u", format_low ));
if ( format_low >= x_count )
goto Failure;
pos[0].x = glyph->x_control[format_low];
@ -398,7 +398,7 @@
break;
case 3: /* vertical line to */
FT_TRACE6(( "- vertical line to cy.%d", format_low ));
FT_TRACE6(( "- vertical line to cy.%u", format_low ));
if ( format_low >= y_count )
goto Failure;
pos[0].x = pos[3].x;
@ -444,7 +444,7 @@
if ( idx >= x_count )
goto Failure;
cur->x = glyph->x_control[idx];
FT_TRACE7(( " cx#%d", idx ));
FT_TRACE7(( " cx#%u", idx ));
break;
case 1: /* 16-bit absolute value */
@ -474,7 +474,7 @@
if ( idx >= y_count )
goto Failure;
cur->y = glyph->y_control[idx];
FT_TRACE7(( " cy#%d", idx ));
FT_TRACE7(( " cy#%u", idx ));
break;
case 1: /* 16-bit absolute value */
@ -754,7 +754,7 @@
count = glyph->num_subs - old_count;
FT_TRACE4(( "compound glyph with %d element%s (offset %lu):\n",
FT_TRACE4(( "compound glyph with %u element%s (offset %lu):\n",
count,
count == 1 ? "" : "s",
offset ));
@ -766,7 +766,7 @@
PFR_SubGlyph subglyph;
FT_TRACE4(( " subglyph %d:\n", n ));
FT_TRACE4(( " subglyph %u:\n", n ));
subglyph = glyph->subs + old_count + n;
old_points = base->n_points;
@ -810,7 +810,7 @@
/* proceed to next sub-glyph */
}
FT_TRACE4(( "end compound glyph with %d element%s\n",
FT_TRACE4(( "end compound glyph with %u element%s\n",
count,
count == 1 ? "" : "s" ));
}

2
src/pfr/pfrobjs.c
View file

@ -326,7 +326,7 @@
FT_ULong gps_offset;
FT_TRACE1(( "pfr_slot_load: glyph index %d\n", gindex ));
FT_TRACE1(( "pfr_slot_load: glyph index %u\n", gindex ));
if ( gindex > 0 )
gindex--;

4
src/psaux/cffdecode.c
View file

@ -2141,7 +2141,7 @@
decoder->locals_bias );
FT_TRACE4(( " callsubr (idx %d, entering level %td)\n",
FT_TRACE4(( " callsubr (idx %u, entering level %td)\n",
idx,
zone - decoder->zones + 1 ));
@ -2185,7 +2185,7 @@
decoder->globals_bias );
FT_TRACE4(( " callgsubr (idx %d, entering level %td)\n",
FT_TRACE4(( " callgsubr (idx %u, entering level %td)\n",
idx,
zone - decoder->zones + 1 ));

4
src/psaux/psobjs.c
View file

@ -1145,7 +1145,7 @@
FT_ERROR(( "ps_parser_load_field:"
" expected a name or string\n" ));
FT_ERROR(( " "
" but found token of type %d instead\n",
" but found token of type %u instead\n",
token.type ));
error = FT_THROW( Invalid_File_Format );
goto Exit;
@ -1225,7 +1225,7 @@
if ( result < 0 || (FT_UInt)result < max_objects )
{
FT_ERROR(( "ps_parser_load_field:"
" expected %d integer%s in the %s subarray\n",
" expected %u integer%s in the %s subarray\n",
max_objects, max_objects > 1 ? "s" : "",
i == 0 ? "first"
: ( i == 1 ? "second"

2
src/psaux/t1decode.c
View file

@ -1633,7 +1633,7 @@
default:
FT_ERROR(( "t1_decoder_parse_charstrings:"
" unhandled opcode %d\n", op ));
" unhandled opcode %u\n", op ));
goto Syntax_Error;
}

2
src/pshinter/pshalgo.c
View file

@ -100,7 +100,7 @@
if ( idx >= table->max_hints )
{
FT_TRACE0(( "psh_hint_table_record: invalid hint index %d\n", idx ));
FT_TRACE0(( "psh_hint_table_record: invalid hint index %u\n", idx ));
return;
}

10
src/pshinter/pshrec.c
View file

@ -467,7 +467,7 @@
table->num_masks--;
}
else
FT_TRACE0(( "ps_mask_table_merge: ignoring invalid indices (%d,%d)\n",
FT_TRACE0(( "ps_mask_table_merge: ignoring invalid indices (%u,%u)\n",
index1, index2 ));
Exit:
@ -817,7 +817,7 @@
/* limit "dimension" to 0..1 */
if ( dimension > 1 )
{
FT_TRACE0(( "ps_hints_stem: invalid dimension (%d) used\n",
FT_TRACE0(( "ps_hints_stem: invalid dimension (%u) used\n",
dimension ));
dimension = ( dimension != 0 );
}
@ -870,7 +870,7 @@
/* limit "dimension" to 0..1 */
if ( dimension > 1 )
{
FT_TRACE0(( "ps_hints_t1stem3: invalid dimension (%d) used\n",
FT_TRACE0(( "ps_hints_t1stem3: invalid dimension (%u) used\n",
dimension ));
dimension = ( dimension != 0 );
}
@ -976,7 +976,7 @@
if ( bit_count != count1 + count2 )
{
FT_TRACE0(( "ps_hints_t2mask:"
" called with invalid bitcount %d (instead of %d)\n",
" called with invalid bitcount %u (instead of %u)\n",
bit_count, count1 + count2 ));
/* simply ignore the operator */
@ -1022,7 +1022,7 @@
if ( bit_count != count1 + count2 )
{
FT_TRACE0(( "ps_hints_t2counter:"
" called with invalid bitcount %d (instead of %d)\n",
" called with invalid bitcount %u (instead of %u)\n",
bit_count, count1 + count2 ));
/* simply ignore the operator */

14
src/sdf/ftsdf.c
View file

@ -1391,7 +1391,7 @@
SDF_Contour* contour = contour_list;
FT_TRACE5(( " Contour %d\n", num_contours ));
FT_TRACE5(( " Contour %u\n", num_contours ));
edge_list = contour->edges;
@ -1400,7 +1400,7 @@
SDF_Edge* edge = edge_list;
FT_TRACE5(( " %3d: ", num_edges ));
FT_TRACE5(( " %3u: ", num_edges ));
switch ( edge->edge_type )
{
@ -1443,11 +1443,11 @@
}
FT_TRACE5(( "\n" ));
FT_TRACE5(( " total number of contours = %d\n", num_contours ));
FT_TRACE5(( " total number of edges = %d\n", total_edges ));
FT_TRACE5(( " |__lines = %d\n", total_lines ));
FT_TRACE5(( " |__conic = %d\n", total_conic ));
FT_TRACE5(( " |__cubic = %d\n", total_cubic ));
FT_TRACE5(( " total number of contours = %u\n", num_contours ));
FT_TRACE5(( " total number of edges = %u\n", total_edges ));
FT_TRACE5(( " |__lines = %u\n", total_lines ));
FT_TRACE5(( " |__conic = %u\n", total_conic ));
FT_TRACE5(( " |__cubic = %u\n", total_cubic ));
}
#endif /* FT_DEBUG_LEVEL_TRACE */

2
src/sfnt/sfdriver.c
View file

@ -895,7 +895,7 @@
FT_TRACE0(( "sfnt_get_var_ps_name:"
" Shortening variation PS name prefix\n" ));
FT_TRACE0(( " "
" to %d characters\n", len ));
" to %u characters\n", len ));
}
face->var_postscript_prefix = result;

6
src/sfnt/sfwoff2.c
View file

@ -902,7 +902,7 @@
substreams[i].offset = pos + offset;
substreams[i].size = substream_size;
FT_TRACE5(( " Substream %d: offset = %lu; size = %lu;\n",
FT_TRACE5(( " Substream %u: offset = %lu; size = %lu;\n",
i, substreams[i].offset, substreams[i].size ));
offset += substream_size;
}
@ -1592,7 +1592,7 @@
WOFF2_TableRec table = *( indices[nn] );
FT_TRACE3(( "Seeking to %ld with table size %ld.\n",
FT_TRACE3(( "Seeking to %lu with table size %lu.\n",
table.src_offset, table.src_length ));
FT_TRACE3(( "Table tag: %c%c%c%c.\n",
(FT_Char)( table.Tag >> 24 ),
@ -1943,7 +1943,7 @@
src_offset += table->TransformLength;
table->dst_offset = 0;
FT_TRACE2(( " %c%c%c%c %08d %08d %08ld %08ld %08ld\n",
FT_TRACE2(( " %c%c%c%c %08d %08d %08lu %08lu %08lu\n",
(FT_Char)( table->Tag >> 24 ),
(FT_Char)( table->Tag >> 16 ),
(FT_Char)( table->Tag >> 8 ),

2
src/sfnt/ttcmap.c
View file

@ -3803,7 +3803,7 @@
p += 2;
num_cmaps = TT_NEXT_USHORT( p );
FT_TRACE4(( "tt_face_build_cmaps: %d cmaps\n", num_cmaps ));
FT_TRACE4(( "tt_face_build_cmaps: %u cmaps\n", num_cmaps ));
limit = table + face->cmap_size;
for ( ; num_cmaps > 0 && p + 8 <= limit; num_cmaps-- )

10
src/sfnt/ttsbit.c
View file

@ -342,7 +342,7 @@
FT_TRACE2(( "tt_face_load_strike_metrics:"
" sanitizing invalid ascender and descender\n" ));
FT_TRACE2(( " "
" values for strike %ld (%dppem, %dppem)\n",
" values for strike %lu (%dppem, %dppem)\n",
strike_index,
metrics->x_ppem, metrics->y_ppem ));
@ -993,7 +993,7 @@
goto Fail;
}
FT_TRACE3(( "tt_sbit_decoder_load_compound: loading %d component%s\n",
FT_TRACE3(( "tt_sbit_decoder_load_compound: loading %u component%s\n",
num_components,
num_components == 1 ? "" : "s" ));
@ -1419,7 +1419,7 @@
image_start = image_offset + image_start;
FT_TRACE3(( "tt_sbit_decoder_load_image:"
" found sbit (format %d) for glyph index %d\n",
" found sbit (format %u) for glyph index %u\n",
image_format, glyph_index ));
return tt_sbit_decoder_load_bitmap( decoder,
@ -1438,13 +1438,13 @@
if ( recurse_count )
{
FT_TRACE4(( "tt_sbit_decoder_load_image:"
" missing subglyph sbit with glyph index %d\n",
" missing subglyph sbit with glyph index %u\n",
glyph_index ));
return FT_THROW( Invalid_Composite );
}
FT_TRACE4(( "tt_sbit_decoder_load_image:"
" no sbit found for glyph index %d\n", glyph_index ));
" no sbit found for glyph index %u\n", glyph_index ));
return FT_THROW( Missing_Bitmap );
}

10
src/truetype/ttgload.c
View file

@ -660,7 +660,7 @@
} while ( subglyph->flags & MORE_COMPONENTS );
gloader->current.num_subglyphs = num_subglyphs;
FT_TRACE5(( " %d component%s\n",
FT_TRACE5(( " %u component%s\n",
num_subglyphs,
num_subglyphs > 1 ? "s" : "" ));
@ -674,7 +674,7 @@
for ( i = 0; i < num_subglyphs; i++ )
{
if ( num_subglyphs > 1 )
FT_TRACE7(( " subglyph %d:\n", i ));
FT_TRACE7(( " subglyph %u:\n", i ));
FT_TRACE7(( " glyph index: %d\n", subglyph->index ));
@ -1437,13 +1437,13 @@
#ifdef FT_DEBUG_LEVEL_TRACE
if ( recurse_count )
FT_TRACE5(( " nesting level: %d\n", recurse_count ));
FT_TRACE5(( " nesting level: %u\n", recurse_count ));
#endif
/* some fonts have an incorrect value of `maxComponentDepth' */
if ( recurse_count > face->max_profile.maxComponentDepth )
{
FT_TRACE1(( "load_truetype_glyph: maxComponentDepth set to %d\n",
FT_TRACE1(( "load_truetype_glyph: maxComponentDepth set to %u\n",
recurse_count ));
face->max_profile.maxComponentDepth = (FT_UShort)recurse_count;
}
@ -2397,7 +2397,7 @@
TT_LoaderRec loader;
FT_TRACE1(( "TT_Load_Glyph: glyph index %d\n", glyph_index ));
FT_TRACE1(( "TT_Load_Glyph: glyph index %u\n", glyph_index ));
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS

54
src/truetype/ttgxvar.c
View file

@ -644,7 +644,7 @@
/* check some data consistency */
if ( word_delta_count > region_idx_count )
{
FT_TRACE2(( "bad short count %d or region count %d\n",
FT_TRACE2(( "bad short count %d or region count %u\n",
word_delta_count,
region_idx_count ));
error = FT_THROW( Invalid_Table );
@ -653,7 +653,7 @@
if ( region_idx_count > itemStore->regionCount )
{
FT_TRACE2(( "inconsistent regionCount %d in varData[%d]\n",
FT_TRACE2(( "inconsistent regionCount %u in varData[%u]\n",
region_idx_count,
i ));
error = FT_THROW( Invalid_Table );
@ -683,7 +683,7 @@
if ( varData->regionIndices[j] >= itemStore->regionCount )
{
FT_TRACE2(( "bad region index %d\n",
FT_TRACE2(( "bad region index %u\n",
varData->regionIndices[j] ));
FT_FRAME_EXIT();
error = FT_THROW( Invalid_Table );
@ -829,7 +829,7 @@
if ( outerIndex >= itemStore->dataCount )
{
FT_TRACE2(( "outerIndex[%ld] == %d out of range\n",
FT_TRACE2(( "outerIndex[%lu] == %u out of range\n",
i,
outerIndex ));
error = FT_THROW( Invalid_Table );
@ -842,7 +842,7 @@
if ( innerIndex >= itemStore->varData[outerIndex].itemCount )
{
FT_TRACE2(( "innerIndex[%ld] == %d out of range\n",
FT_TRACE2(( "innerIndex[%lu] == %u out of range\n",
i,
innerIndex ));
error = FT_THROW( Invalid_Table );
@ -1909,7 +1909,7 @@
else
{
FT_TRACE2(( "ft_var_load_gvar:"
" glyph variation data offset %d not monotonic\n",
" glyph variation data offset %u not monotonic\n",
i ));
blend->glyphoffsets[i] = max_offset;
}
@ -1918,7 +1918,7 @@
if ( limit < blend->glyphoffsets[i] )
{
FT_TRACE2(( "ft_var_load_gvar:"
" glyph variation data offset %d out of range\n",
" glyph variation data offset %u out of range\n",
i ));
blend->glyphoffsets[i] = limit;
}
@ -1947,7 +1947,7 @@
else
{
FT_TRACE2(( "ft_var_load_gvar:"
" glyph variation data offset %d not monotonic\n",
" glyph variation data offset %u not monotonic\n",
i ));
blend->glyphoffsets[i] = max_offset;
}
@ -1956,7 +1956,7 @@
if ( limit < blend->glyphoffsets[i] )
{
FT_TRACE2(( "ft_var_load_gvar:"
" glyph variation data offset %d out of range\n",
" glyph variation data offset %u out of range\n",
i ));
blend->glyphoffsets[i] = limit;
}
@ -2077,7 +2077,7 @@
ncv = blend->normalizedcoords[i];
FT_TRACE6(( " axis %d coordinate %.5f:\n", i, (double)ncv / 65536 ));
FT_TRACE6(( " axis %u coordinate %.5f:\n", i, (double)ncv / 65536 ));
if ( ncv == 0 )
{
@ -2175,7 +2175,7 @@
if ( num_coords > mmvar->num_axis )
{
FT_TRACE2(( "ft_var_to_normalized:"
" only using first %d of %d coordinates\n",
" only using first %u of %u coordinates\n",
mmvar->num_axis, num_coords ));
num_coords = mmvar->num_axis;
}
@ -2190,7 +2190,7 @@
FT_Fixed coord = coords[i];
FT_TRACE5(( " %d: %.5f\n", i, (double)coord / 65536 ));
FT_TRACE5(( " %u: %.5f\n", i, (double)coord / 65536 ));
if ( coord > a->maximum || coord < a->minimum )
{
FT_TRACE1(( "ft_var_to_normalized: design coordinate %.5f\n",
@ -2330,7 +2330,7 @@
if ( num_coords > blend->num_axis )
{
FT_TRACE2(( "ft_var_to_design:"
" only using first %d of %d coordinates\n",
" only using first %u of %u coordinates\n",
blend->num_axis, num_coords ));
nc = blend->num_axis;
}
@ -2690,7 +2690,7 @@
" minimum default maximum flags\n" ));
/* " XXXX.XXXXX XXXX.XXXXX XXXX.XXXXX 0xXXXX" */
FT_TRACE5(( " %3d `%s'"
FT_TRACE5(( " %3u `%s'"
" %10.5f %10.5f %10.5f 0x%04X%s\n",
i,
a->name,
@ -2782,7 +2782,7 @@
(void)FT_STREAM_SEEK( pos );
FT_TRACE5(( " named instance %d (%s%s%s, %s%s%s)\n",
FT_TRACE5(( " named instance %u (%s%s%s, %s%s%s)\n",
i,
strname ? "name: `" : "",
strname ? strname : "unnamed",
@ -2962,7 +2962,7 @@
if ( num_coords > mmvar->num_axis )
{
FT_TRACE2(( "TT_Set_MM_Blend:"
" only using first %d of %d coordinates\n",
" only using first %u of %u coordinates\n",
mmvar->num_axis, num_coords ));
num_coords = mmvar->num_axis;
}
@ -3249,7 +3249,7 @@
if ( num_coords > blend->num_axis )
{
FT_TRACE2(( "TT_Get_MM_Blend:"
" only using first %d of %d coordinates\n",
" only using first %u of %u coordinates\n",
blend->num_axis, num_coords ));
nc = blend->num_axis;
}
@ -3331,7 +3331,7 @@
if ( num_coords > mmvar->num_axis )
{
FT_TRACE2(( "TT_Set_Var_Design:"
" only using first %d of %d coordinates\n",
" only using first %u of %u coordinates\n",
mmvar->num_axis, num_coords ));
num_coords = mmvar->num_axis;
}
@ -3480,7 +3480,7 @@
if ( num_coords > blend->num_axis )
{
FT_TRACE2(( "TT_Get_Var_Design:"
" only using first %d of %d coordinates\n",
" only using first %u of %u coordinates\n",
blend->num_axis, num_coords ));
nc = blend->num_axis;
}
@ -3813,7 +3813,7 @@
FT_Stream_SeekSet( stream, here );
}
FT_TRACE5(( "cvar: there %s %d tuple%s:\n",
FT_TRACE5(( "cvar: there %s %u tuple%s:\n",
( tupleCount & GX_TC_TUPLE_COUNT_MASK ) == 1 ? "is" : "are",
tupleCount & GX_TC_TUPLE_COUNT_MASK,
( tupleCount & GX_TC_TUPLE_COUNT_MASK ) == 1 ? "" : "s" ));
@ -3832,7 +3832,7 @@
FT_Fixed apply;
FT_TRACE6(( " tuple %d:\n", i ));
FT_TRACE6(( " tuple %u:\n", i ));
tupleDataSize = FT_GET_USHORT();
tupleIndex = FT_GET_USHORT();
@ -3919,7 +3919,7 @@
#ifdef FT_DEBUG_LEVEL_TRACE
if ( old_cvt_delta != cvt_deltas[j] )
{
FT_TRACE7(( " %d: %f -> %f\n",
FT_TRACE7(( " %u: %f -> %f\n",
j,
(double)( FT_fdot6ToFixed( face->cvt[j] ) +
old_cvt_delta ) / 65536,
@ -4315,7 +4315,7 @@
blend->glyphoffsets[glyph_index + 1] )
{
FT_TRACE2(( "TT_Vary_Apply_Glyph_Deltas:"
" no variation data for glyph %d\n", glyph_index ));
" no variation data for glyph %u\n", glyph_index ));
return FT_Err_Ok;
}
@ -4359,7 +4359,7 @@
FT_Stream_SeekSet( stream, here );
}
FT_TRACE5(( "gvar: there %s %d tuple%s:\n",
FT_TRACE5(( "gvar: there %s %u tuple%s:\n",
( tupleCount & GX_TC_TUPLE_COUNT_MASK ) == 1 ? "is" : "are",
tupleCount & GX_TC_TUPLE_COUNT_MASK,
( tupleCount & GX_TC_TUPLE_COUNT_MASK ) == 1 ? "" : "s" ));
@ -4415,7 +4415,7 @@
FT_Fixed* tupleScalars;
FT_TRACE6(( " tuple %d:\n", i ));
FT_TRACE6(( " tuple %u:\n", i ));
tupleScalars = blend->tuplescalars;
@ -4556,7 +4556,7 @@
#ifdef FT_DEBUG_LEVEL_TRACE
if ( point_delta_x || point_delta_y )
{
FT_TRACE7(( " %d: (%f, %f) -> (%f, %f)\n",
FT_TRACE7(( " %u: (%f, %f) -> (%f, %f)\n",
j,
(double)( FT_intToFixed( outline->points[j].x ) +
old_point_delta_x ) / 65536,
@ -4630,7 +4630,7 @@
#ifdef FT_DEBUG_LEVEL_TRACE
if ( point_delta_x || point_delta_y )
{
FT_TRACE7(( " %d: (%f, %f) -> (%f, %f)\n",
FT_TRACE7(( " %u: (%f, %f) -> (%f, %f)\n",
j,
(double)( FT_intToFixed( outline->points[j].x ) +
old_point_delta_x ) / 65536,

8
src/truetype/ttinterp.c
View file

@ -7382,7 +7382,7 @@
} while ( !exc->instruction_trap );
LNo_Error_:
FT_TRACE4(( " %ld instruction%s executed\n",
FT_TRACE4(( " %lu instruction%s executed\n",
ins_counter,
ins_counter == 1 ? "" : "s" ));
@ -7435,7 +7435,7 @@
num_twilight_points = 0xFFFFU;
FT_TRACE5(( "TT_RunIns: Resetting number of twilight points\n" ));
FT_TRACE5(( " from %d to the more reasonable value %ld\n",
FT_TRACE5(( " from %d to the more reasonable value %lu\n",
exec->twilight.n_points,
num_twilight_points ));
exec->twilight.n_points = (FT_UShort)num_twilight_points;
@ -7470,11 +7470,11 @@
exec->loopcall_counter_max = 100 * (FT_ULong)exec->face->root.num_glyphs;
FT_TRACE5(( "TT_RunIns: Limiting total number of loops in LOOPCALL"
" to %ld\n", exec->loopcall_counter_max ));
" to %lu\n", exec->loopcall_counter_max ));
exec->neg_jump_counter_max = exec->loopcall_counter_max;
FT_TRACE5(( "TT_RunIns: Limiting total number of backward jumps"
" to %ld\n", exec->neg_jump_counter_max ));
" to %lu\n", exec->neg_jump_counter_max ));
/* set PPEM and CVT functions */
if ( exec->metrics.x_ppem != exec->metrics.y_ppem )

2
src/truetype/ttobjs.c
View file

@ -968,7 +968,7 @@
/* Note that this scaling operation is very sensitive to rounding; */
/* the integer division by 64 must be applied to the first argument. */
exec->cvt[i] = FT_MulFix( face->cvt[i] / 64, size->ttmetrics.scale );
FT_TRACE6(( " %3d: %f (%f)\n",
FT_TRACE6(( " %3u: %f (%f)\n",
i, (double)face->cvt[i] / 64, (double)exec->cvt[i] / 64 ));
}
FT_TRACE6(( "\n" ));

16
src/truetype/ttpload.c
View file

@ -110,7 +110,7 @@
if ( face->num_locations != (FT_ULong)face->root.num_glyphs + 1 )
{
FT_TRACE2(( "glyph count mismatch! loca: %ld, maxp: %ld\n",
FT_TRACE2(( "glyph count mismatch! loca: %lu, maxp: %ld\n",
face->num_locations - 1, face->root.num_glyphs ));
/* we only handle the case where `maxp' gives a larger value */
@ -151,7 +151,7 @@
face->num_locations = (FT_ULong)face->root.num_glyphs + 1;
table_len = new_loca_len;
FT_TRACE2(( "adjusting num_locations to %ld\n",
FT_TRACE2(( "adjusting num_locations to %lu\n",
face->num_locations ));
}
else
@ -225,7 +225,7 @@
if ( pos1 > ttface->glyf_len )
{
FT_TRACE1(( "tt_face_get_location:"
" too large offset (0x%08lx) found for glyph index %d,\n",
" too large offset (0x%08lx) found for glyph index %u,\n",
pos1, gindex ));
FT_TRACE1(( " "
" exceeding the end of `glyf' table (0x%08lx)\n",
@ -240,17 +240,17 @@
if ( gindex == ttface->num_locations - 2 )
{
FT_TRACE1(( "tt_face_get_location:"
" too large size (%ld bytes) found for glyph index %d,\n",
" too large size (%lu bytes) found for glyph index %u,\n",
pos2 - pos1, gindex ));
FT_TRACE1(( " "
" truncating at the end of `glyf' table to %ld bytes\n",
" truncating at the end of `glyf' table to %lu bytes\n",
ttface->glyf_len - pos1 ));
pos2 = ttface->glyf_len;
}
else
{
FT_TRACE1(( "tt_face_get_location:"
" too large offset (0x%08lx) found for glyph index %d,\n",
" too large offset (0x%08lx) found for glyph index %u,\n",
pos2, gindex + 1 ));
FT_TRACE1(( " "
" exceeding the end of `glyf' table (0x%08lx)\n",
@ -419,7 +419,7 @@
if ( FT_FRAME_EXTRACT( table_len, face->font_program ) )
goto Exit;
FT_TRACE2(( "loaded, %12ld bytes\n", face->font_program_size ));
FT_TRACE2(( "loaded, %12lu bytes\n", face->font_program_size ));
}
Exit:
@ -482,7 +482,7 @@
if ( FT_FRAME_EXTRACT( table_len, face->cvt_program ) )
goto Exit;
FT_TRACE2(( "loaded, %12ld bytes\n", face->cvt_program_size ));
FT_TRACE2(( "loaded, %12lu bytes\n", face->cvt_program_size ));
}
Exit:

6
src/type1/t1gload.c
View file

@ -303,7 +303,7 @@
{
advances[nn] = 0;
FT_TRACE5(( " idx %d: advance height 0 font units\n",
FT_TRACE5(( " idx %u: advance height 0 font units\n",
first + nn ));
}
@ -341,7 +341,7 @@
else
advances[nn] = 0;
FT_TRACE5(( " idx %d: advance width %ld font unit%s\n",
FT_TRACE5(( " idx %u: advance width %ld font unit%s\n",
first + nn,
advances[nn],
advances[nn] == 1 ? "" : "s" ));
@ -388,7 +388,7 @@
goto Exit;
}
FT_TRACE1(( "T1_Load_Glyph: glyph index %d\n", glyph_index ));
FT_TRACE1(( "T1_Load_Glyph: glyph index %u\n", glyph_index ));
FT_ASSERT( ( face->len_buildchar == 0 ) == ( face->buildchar == NULL ) );

4
src/type1/t1load.c
View file

@ -471,7 +471,7 @@
nc = num_coords;
if ( num_coords > blend->num_axis )
{
FT_TRACE2(( "T1_Get_MM_Blend: only using first %d of %d coordinates\n",
FT_TRACE2(( "T1_Get_MM_Blend: only using first %u of %u coordinates\n",
blend->num_axis, num_coords ));
nc = blend->num_axis;
}
@ -691,7 +691,7 @@
if ( num_coords > blend->num_axis )
{
FT_TRACE2(( "T1_Get_Var_Design:"
" only using first %d of %d coordinates\n",
" only using first %u of %u coordinates\n",
blend->num_axis, num_coords ));
nc = blend->num_axis;
}

2
src/type42/t42objs.c
View file

@ -658,7 +658,7 @@
FT_Driver_Class ttclazz = ((T42_Driver)glyph->face->driver)->ttclazz;
FT_TRACE1(( "T42_GlyphSlot_Load: glyph index %d\n", glyph_index ));
FT_TRACE1(( "T42_GlyphSlot_Load: glyph index %u\n", glyph_index ));
/* map T42 glyph index to embedded TTF's glyph index */
glyph_index = (FT_UInt)ft_strtol(

2
src/type42/t42parse.c
View file

@ -697,7 +697,7 @@
goto Fail;
}
FT_TRACE2(( " PS string size %5lu bytes, offset 0x%08lx (%lu)\n",
FT_TRACE2(( " PS string size %5lu bytes, offset 0x%08lx (%ld)\n",
string_size, ttf_count, ttf_count ));
/* The whole TTF is now loaded into `string_buf'. We are */

2
src/winfonts/winfnt.c
View file

@ -1031,7 +1031,7 @@
goto Exit;
}
FT_TRACE1(( "FNT_Load_Glyph: glyph index %d\n", glyph_index ));
FT_TRACE1(( "FNT_Load_Glyph: glyph index %u\n", glyph_index ));
if ( glyph_index > 0 )
glyph_index--; /* revert to real index */