Fix `-Wformat' compiler warnings.
* src/*: Fix format specifiers. * builds/unix/ftsystem.c (FT_Stream_Open): Ditto.
This commit is contained in:
parent
8cfc41ae95
commit
53be1753de
|
@ -1,3 +1,11 @@
|
||||||
|
2020-07-28 Priyesh Kumar <priyeshkkumar@gmail.com>
|
||||||
|
|
||||||
|
Fix `-Wformat' compiler warnings.
|
||||||
|
|
||||||
|
* src/*: Fix format specifiers.
|
||||||
|
|
||||||
|
* builds/unix/ftsystem.c (FT_Stream_Open): Ditto.
|
||||||
|
|
||||||
2020-07-25 Werner Lemberg <wl@gnu.org>
|
2020-07-25 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
Fix `-Wformat' compiler warnings.
|
Fix `-Wformat' compiler warnings.
|
||||||
|
|
|
@ -351,7 +351,7 @@
|
||||||
stream->read = 0;
|
stream->read = 0;
|
||||||
|
|
||||||
FT_TRACE1(( "FT_Stream_Open:" ));
|
FT_TRACE1(( "FT_Stream_Open:" ));
|
||||||
FT_TRACE1(( " opened `%s' (%d bytes) successfully\n",
|
FT_TRACE1(( " opened `%s' (%ld bytes) successfully\n",
|
||||||
filepathname, stream->size ));
|
filepathname, stream->size ));
|
||||||
|
|
||||||
return FT_Err_Ok;
|
return FT_Err_Ok;
|
||||||
|
|
|
@ -157,7 +157,7 @@
|
||||||
if ( !glyph_index )
|
if ( !glyph_index )
|
||||||
goto Exit;
|
goto Exit;
|
||||||
|
|
||||||
FT_TRACE5(( "standard character: U+%04lX (glyph index %d)\n",
|
FT_TRACE5(( "standard character: U+%04lX (glyph index %ld)\n",
|
||||||
ch, glyph_index ));
|
ch, glyph_index ));
|
||||||
|
|
||||||
error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE );
|
error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE );
|
||||||
|
@ -260,9 +260,9 @@
|
||||||
dim == AF_DIMENSION_VERT ? "horizontal"
|
dim == AF_DIMENSION_VERT ? "horizontal"
|
||||||
: "vertical" ));
|
: "vertical" ));
|
||||||
|
|
||||||
FT_TRACE5(( " %d (standard)", axis->standard_width ));
|
FT_TRACE5(( " %ld (standard)", axis->standard_width ));
|
||||||
for ( i = 1; i < axis->width_count; i++ )
|
for ( i = 1; i < axis->width_count; i++ )
|
||||||
FT_TRACE5(( " %d", axis->widths[i].org ));
|
FT_TRACE5(( " %ld", axis->widths[i].org ));
|
||||||
|
|
||||||
FT_TRACE5(( "\n" ));
|
FT_TRACE5(( "\n" ));
|
||||||
}
|
}
|
||||||
|
@ -727,7 +727,7 @@
|
||||||
|
|
||||||
delta2 = FT_MulFix( delta2, scale );
|
delta2 = FT_MulFix( delta2, scale );
|
||||||
|
|
||||||
FT_TRACE5(( "delta: %d", delta1 ));
|
FT_TRACE5(( "delta: %ld", delta1 ));
|
||||||
if ( delta2 < 32 )
|
if ( delta2 < 32 )
|
||||||
delta2 = 0;
|
delta2 = 0;
|
||||||
#if 0
|
#if 0
|
||||||
|
@ -736,7 +736,7 @@
|
||||||
#endif
|
#endif
|
||||||
else
|
else
|
||||||
delta2 = FT_PIX_ROUND( delta2 );
|
delta2 = FT_PIX_ROUND( delta2 );
|
||||||
FT_TRACE5(( "/%d\n", delta2 ));
|
FT_TRACE5(( "/%ld\n", delta2 ));
|
||||||
|
|
||||||
if ( delta1 < 0 )
|
if ( delta1 < 0 )
|
||||||
delta2 = -delta2;
|
delta2 = -delta2;
|
||||||
|
@ -1643,7 +1643,7 @@
|
||||||
|
|
||||||
stem_edge->pos = base_edge->pos + fitted_width;
|
stem_edge->pos = base_edge->pos + fitted_width;
|
||||||
|
|
||||||
FT_TRACE5(( " CJKLINK: edge %d @%d (opos=%.2f) linked to %.2f,"
|
FT_TRACE5(( " CJKLINK: edge %ld @%d (opos=%.2f) linked to %.2f,"
|
||||||
" dist was %.2f, now %.2f\n",
|
" dist was %.2f, now %.2f\n",
|
||||||
stem_edge - hints->axis[dim].edges, stem_edge->fpos,
|
stem_edge - hints->axis[dim].edges, stem_edge->fpos,
|
||||||
stem_edge->opos / 64.0, stem_edge->pos / 64.0,
|
stem_edge->opos / 64.0, stem_edge->pos / 64.0,
|
||||||
|
@ -1865,7 +1865,7 @@
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||||
FT_TRACE5(( " CJKBLUE: edge %d @%d (opos=%.2f) snapped to %.2f,"
|
FT_TRACE5(( " CJKBLUE: edge %ld @%d (opos=%.2f) snapped to %.2f,"
|
||||||
" was %.2f\n",
|
" was %.2f\n",
|
||||||
edge1 - edges, edge1->fpos, edge1->opos / 64.0,
|
edge1 - edges, edge1->fpos, edge1->opos / 64.0,
|
||||||
blue->fit / 64.0, edge1->pos / 64.0 ));
|
blue->fit / 64.0, edge1->pos / 64.0 ));
|
||||||
|
@ -1929,7 +1929,7 @@
|
||||||
/* this should not happen, but it's better to be safe */
|
/* this should not happen, but it's better to be safe */
|
||||||
if ( edge2->blue_edge )
|
if ( edge2->blue_edge )
|
||||||
{
|
{
|
||||||
FT_TRACE5(( "ASSERTION FAILED for edge %d\n", edge2-edges ));
|
FT_TRACE5(( "ASSERTION FAILED for edge %ld\n", edge2-edges ));
|
||||||
|
|
||||||
af_cjk_align_linked_edge( hints, dim, edge2, edge );
|
af_cjk_align_linked_edge( hints, dim, edge2, edge );
|
||||||
edge->flags |= AF_EDGE_DONE;
|
edge->flags |= AF_EDGE_DONE;
|
||||||
|
|
|
@ -306,7 +306,7 @@
|
||||||
if ( !( count % 10 ) )
|
if ( !( count % 10 ) )
|
||||||
FT_TRACE4(( " " ));
|
FT_TRACE4(( " " ));
|
||||||
|
|
||||||
FT_TRACE4(( " %d", idx ));
|
FT_TRACE4(( " %ld", idx ));
|
||||||
count++;
|
count++;
|
||||||
|
|
||||||
if ( !( count % 10 ) )
|
if ( !( count % 10 ) )
|
||||||
|
|
|
@ -154,7 +154,7 @@
|
||||||
goto Exit;
|
goto Exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
FT_TRACE5(( "standard character: U+%04lX (glyph index %d)\n",
|
FT_TRACE5(( "standard character: U+%04lX (glyph index %ld)\n",
|
||||||
ch, glyph_index ));
|
ch, glyph_index ));
|
||||||
|
|
||||||
error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE );
|
error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE );
|
||||||
|
@ -257,9 +257,9 @@
|
||||||
dim == AF_DIMENSION_VERT ? "horizontal"
|
dim == AF_DIMENSION_VERT ? "horizontal"
|
||||||
: "vertical" ));
|
: "vertical" ));
|
||||||
|
|
||||||
FT_TRACE5(( " %d (standard)", axis->standard_width ));
|
FT_TRACE5(( " %ld (standard)", axis->standard_width ));
|
||||||
for ( i = 1; i < axis->width_count; i++ )
|
for ( i = 1; i < axis->width_count; i++ )
|
||||||
FT_TRACE5(( " %d", axis->widths[i].org ));
|
FT_TRACE5(( " %ld", axis->widths[i].org ));
|
||||||
|
|
||||||
FT_TRACE5(( "\n" ));
|
FT_TRACE5(( "\n" ));
|
||||||
}
|
}
|
||||||
|
@ -1031,7 +1031,7 @@
|
||||||
{
|
{
|
||||||
*a = *b;
|
*a = *b;
|
||||||
FT_TRACE5(( "blue zone overlap:"
|
FT_TRACE5(( "blue zone overlap:"
|
||||||
" adjusting %s %d to %ld\n",
|
" adjusting %s %ld to %ld\n",
|
||||||
a_is_top ? "overshoot" : "reference",
|
a_is_top ? "overshoot" : "reference",
|
||||||
blue_sorted[i] - axis->blues,
|
blue_sorted[i] - axis->blues,
|
||||||
*a ));
|
*a ));
|
||||||
|
@ -1279,7 +1279,7 @@
|
||||||
"af_latin_metrics_scale_dim:"
|
"af_latin_metrics_scale_dim:"
|
||||||
" x height alignment (style `%s'):\n"
|
" x height alignment (style `%s'):\n"
|
||||||
" "
|
" "
|
||||||
" vertical scaling changed from %.5f to %.5f (by %d%%)\n"
|
" vertical scaling changed from %.5f to %.5f (by %ld%%)\n"
|
||||||
"\n",
|
"\n",
|
||||||
af_style_names[metrics->root.style_class->style],
|
af_style_names[metrics->root.style_class->style],
|
||||||
scale / 65536.0,
|
scale / 65536.0,
|
||||||
|
@ -1332,7 +1332,7 @@
|
||||||
width->cur = FT_MulFix( width->org, scale );
|
width->cur = FT_MulFix( width->org, scale );
|
||||||
width->fit = width->cur;
|
width->fit = width->cur;
|
||||||
|
|
||||||
FT_TRACE5(( " %d scaled to %.2f\n",
|
FT_TRACE5(( " %ld scaled to %.2f\n",
|
||||||
width->org,
|
width->org,
|
||||||
width->cur / 64.0 ));
|
width->cur / 64.0 ));
|
||||||
}
|
}
|
||||||
|
@ -1473,8 +1473,8 @@
|
||||||
AF_LatinBlue blue = &axis->blues[nn];
|
AF_LatinBlue blue = &axis->blues[nn];
|
||||||
|
|
||||||
|
|
||||||
FT_TRACE5(( " reference %d: %d scaled to %.2f%s\n"
|
FT_TRACE5(( " reference %d: %ld scaled to %.2f%s\n"
|
||||||
" overshoot %d: %d scaled to %.2f%s\n",
|
" overshoot %d: %ld scaled to %.2f%s\n",
|
||||||
nn,
|
nn,
|
||||||
blue->ref.org,
|
blue->ref.org,
|
||||||
blue->ref.fit / 64.0,
|
blue->ref.fit / 64.0,
|
||||||
|
@ -2944,7 +2944,7 @@
|
||||||
|
|
||||||
stem_edge->pos = base_edge->pos + fitted_width;
|
stem_edge->pos = base_edge->pos + fitted_width;
|
||||||
|
|
||||||
FT_TRACE5(( " LINK: edge %d (opos=%.2f) linked to %.2f,"
|
FT_TRACE5(( " LINK: edge %ld (opos=%.2f) linked to %.2f,"
|
||||||
" dist was %.2f, now %.2f\n",
|
" dist was %.2f, now %.2f\n",
|
||||||
stem_edge - hints->axis[dim].edges, stem_edge->opos / 64.0,
|
stem_edge - hints->axis[dim].edges, stem_edge->opos / 64.0,
|
||||||
stem_edge->pos / 64.0, dist / 64.0, fitted_width / 64.0 ));
|
stem_edge->pos / 64.0, dist / 64.0, fitted_width / 64.0 ));
|
||||||
|
@ -3068,12 +3068,12 @@
|
||||||
|
|
||||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||||
if ( !anchor )
|
if ( !anchor )
|
||||||
FT_TRACE5(( " BLUE_ANCHOR: edge %d (opos=%.2f) snapped to %.2f,"
|
FT_TRACE5(( " BLUE_ANCHOR: edge %ld (opos=%.2f) snapped to %.2f,"
|
||||||
" was %.2f (anchor=edge %d)\n",
|
" was %.2f (anchor=edge %ld)\n",
|
||||||
edge1 - edges, edge1->opos / 64.0, blue->fit / 64.0,
|
edge1 - edges, edge1->opos / 64.0, blue->fit / 64.0,
|
||||||
edge1->pos / 64.0, edge - edges ));
|
edge1->pos / 64.0, edge - edges ));
|
||||||
else
|
else
|
||||||
FT_TRACE5(( " BLUE: edge %d (opos=%.2f) snapped to %.2f,"
|
FT_TRACE5(( " BLUE: edge %ld (opos=%.2f) snapped to %.2f,"
|
||||||
" was %.2f\n",
|
" was %.2f\n",
|
||||||
edge1 - edges, edge1->opos / 64.0, blue->fit / 64.0,
|
edge1 - edges, edge1->opos / 64.0, blue->fit / 64.0,
|
||||||
edge1->pos / 64.0 ));
|
edge1->pos / 64.0 ));
|
||||||
|
@ -3122,7 +3122,7 @@
|
||||||
/* this should not happen, but it's better to be safe */
|
/* this should not happen, but it's better to be safe */
|
||||||
if ( edge2->blue_edge )
|
if ( edge2->blue_edge )
|
||||||
{
|
{
|
||||||
FT_TRACE5(( " ASSERTION FAILED for edge %d\n", edge2 - edges ));
|
FT_TRACE5(( " ASSERTION FAILED for edge %ld\n", edge2 - edges ));
|
||||||
|
|
||||||
af_latin_align_linked_edge( hints, dim, edge2, edge );
|
af_latin_align_linked_edge( hints, dim, edge2, edge );
|
||||||
edge->flags |= AF_EDGE_DONE;
|
edge->flags |= AF_EDGE_DONE;
|
||||||
|
@ -3190,7 +3190,7 @@
|
||||||
anchor = edge;
|
anchor = edge;
|
||||||
edge->flags |= AF_EDGE_DONE;
|
edge->flags |= AF_EDGE_DONE;
|
||||||
|
|
||||||
FT_TRACE5(( " ANCHOR: edge %d (opos=%.2f) and %d (opos=%.2f)"
|
FT_TRACE5(( " ANCHOR: edge %ld (opos=%.2f) and %ld (opos=%.2f)"
|
||||||
" snapped to %.2f and %.2f\n",
|
" snapped to %.2f and %.2f\n",
|
||||||
edge - edges, edge->opos / 64.0,
|
edge - edges, edge->opos / 64.0,
|
||||||
edge2 - edges, edge2->opos / 64.0,
|
edge2 - edges, edge2->opos / 64.0,
|
||||||
|
@ -3219,7 +3219,7 @@
|
||||||
|
|
||||||
if ( edge2->flags & AF_EDGE_DONE )
|
if ( edge2->flags & AF_EDGE_DONE )
|
||||||
{
|
{
|
||||||
FT_TRACE5(( " ADJUST: edge %d (pos=%.2f) moved to %.2f\n",
|
FT_TRACE5(( " ADJUST: edge %ld (pos=%.2f) moved to %.2f\n",
|
||||||
edge - edges, edge->pos / 64.0,
|
edge - edges, edge->pos / 64.0,
|
||||||
( edge2->pos - cur_len ) / 64.0 ));
|
( edge2->pos - cur_len ) / 64.0 ));
|
||||||
|
|
||||||
|
@ -3260,7 +3260,7 @@
|
||||||
edge->pos = cur_pos1 - cur_len / 2;
|
edge->pos = cur_pos1 - cur_len / 2;
|
||||||
edge2->pos = cur_pos1 + cur_len / 2;
|
edge2->pos = cur_pos1 + cur_len / 2;
|
||||||
|
|
||||||
FT_TRACE5(( " STEM: edge %d (opos=%.2f) linked to %d (opos=%.2f)"
|
FT_TRACE5(( " STEM: edge %ld (opos=%.2f) linked to %ld (opos=%.2f)"
|
||||||
" snapped to %.2f and %.2f\n",
|
" snapped to %.2f and %.2f\n",
|
||||||
edge - edges, edge->opos / 64.0,
|
edge - edges, edge->opos / 64.0,
|
||||||
edge2 - edges, edge2->opos / 64.0,
|
edge2 - edges, edge2->opos / 64.0,
|
||||||
|
@ -3291,7 +3291,7 @@
|
||||||
edge->pos = ( delta1 < delta2 ) ? cur_pos1 : cur_pos2;
|
edge->pos = ( delta1 < delta2 ) ? cur_pos1 : cur_pos2;
|
||||||
edge2->pos = edge->pos + cur_len;
|
edge2->pos = edge->pos + cur_len;
|
||||||
|
|
||||||
FT_TRACE5(( " STEM: edge %d (opos=%.2f) linked to %d (opos=%.2f)"
|
FT_TRACE5(( " STEM: edge %ld (opos=%.2f) linked to %ld (opos=%.2f)"
|
||||||
" snapped to %.2f and %.2f\n",
|
" snapped to %.2f and %.2f\n",
|
||||||
edge - edges, edge->opos / 64.0,
|
edge - edges, edge->opos / 64.0,
|
||||||
edge2 - edges, edge2->opos / 64.0,
|
edge2 - edges, edge2->opos / 64.0,
|
||||||
|
@ -3314,7 +3314,7 @@
|
||||||
if ( edge->link && FT_ABS( edge->link->pos - edge[-1].pos ) > 16 )
|
if ( edge->link && FT_ABS( edge->link->pos - edge[-1].pos ) > 16 )
|
||||||
{
|
{
|
||||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||||
FT_TRACE5(( " BOUND: edge %d (pos=%.2f) moved to %.2f\n",
|
FT_TRACE5(( " BOUND: edge %ld (pos=%.2f) moved to %.2f\n",
|
||||||
edge - edges,
|
edge - edges,
|
||||||
edge->pos / 64.0,
|
edge->pos / 64.0,
|
||||||
edge[-1].pos / 64.0 ));
|
edge[-1].pos / 64.0 ));
|
||||||
|
@ -3416,7 +3416,7 @@
|
||||||
if ( delta < 64 + 16 )
|
if ( delta < 64 + 16 )
|
||||||
{
|
{
|
||||||
af_latin_align_serif_edge( hints, edge->serif, edge );
|
af_latin_align_serif_edge( hints, edge->serif, edge );
|
||||||
FT_TRACE5(( " SERIF: edge %d (opos=%.2f) serif to %d (opos=%.2f)"
|
FT_TRACE5(( " SERIF: edge %ld (opos=%.2f) serif to %ld (opos=%.2f)"
|
||||||
" aligned to %.2f\n",
|
" aligned to %.2f\n",
|
||||||
edge - edges, edge->opos / 64.0,
|
edge - edges, edge->opos / 64.0,
|
||||||
edge->serif - edges, edge->serif->opos / 64.0,
|
edge->serif - edges, edge->serif->opos / 64.0,
|
||||||
|
@ -3426,7 +3426,7 @@
|
||||||
{
|
{
|
||||||
edge->pos = FT_PIX_ROUND( edge->opos );
|
edge->pos = FT_PIX_ROUND( edge->opos );
|
||||||
anchor = edge;
|
anchor = edge;
|
||||||
FT_TRACE5(( " SERIF_ANCHOR: edge %d (opos=%.2f)"
|
FT_TRACE5(( " SERIF_ANCHOR: edge %ld (opos=%.2f)"
|
||||||
" snapped to %.2f\n",
|
" snapped to %.2f\n",
|
||||||
edge-edges, edge->opos / 64.0, edge->pos / 64.0 ));
|
edge-edges, edge->opos / 64.0, edge->pos / 64.0 ));
|
||||||
}
|
}
|
||||||
|
@ -3454,8 +3454,8 @@
|
||||||
after->pos - before->pos,
|
after->pos - before->pos,
|
||||||
after->opos - before->opos );
|
after->opos - before->opos );
|
||||||
|
|
||||||
FT_TRACE5(( " SERIF_LINK1: edge %d (opos=%.2f) snapped to %.2f"
|
FT_TRACE5(( " SERIF_LINK1: edge %ld (opos=%.2f) snapped to %.2f"
|
||||||
" from %d (opos=%.2f)\n",
|
" from %ld (opos=%.2f)\n",
|
||||||
edge - edges, edge->opos / 64.0,
|
edge - edges, edge->opos / 64.0,
|
||||||
edge->pos / 64.0,
|
edge->pos / 64.0,
|
||||||
before - edges, before->opos / 64.0 ));
|
before - edges, before->opos / 64.0 ));
|
||||||
|
@ -3464,7 +3464,7 @@
|
||||||
{
|
{
|
||||||
edge->pos = anchor->pos +
|
edge->pos = anchor->pos +
|
||||||
( ( edge->opos - anchor->opos + 16 ) & ~31 );
|
( ( edge->opos - anchor->opos + 16 ) & ~31 );
|
||||||
FT_TRACE5(( " SERIF_LINK2: edge %d (opos=%.2f)"
|
FT_TRACE5(( " SERIF_LINK2: edge %ld (opos=%.2f)"
|
||||||
" snapped to %.2f\n",
|
" snapped to %.2f\n",
|
||||||
edge - edges, edge->opos / 64.0, edge->pos / 64.0 ));
|
edge - edges, edge->opos / 64.0, edge->pos / 64.0 ));
|
||||||
}
|
}
|
||||||
|
@ -3484,7 +3484,7 @@
|
||||||
if ( edge->link && FT_ABS( edge->link->pos - edge[-1].pos ) > 16 )
|
if ( edge->link && FT_ABS( edge->link->pos - edge[-1].pos ) > 16 )
|
||||||
{
|
{
|
||||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||||
FT_TRACE5(( " BOUND: edge %d (pos=%.2f) moved to %.2f\n",
|
FT_TRACE5(( " BOUND: edge %ld (pos=%.2f) moved to %.2f\n",
|
||||||
edge - edges,
|
edge - edges,
|
||||||
edge->pos / 64.0,
|
edge->pos / 64.0,
|
||||||
edge[-1].pos / 64.0 ));
|
edge[-1].pos / 64.0 ));
|
||||||
|
@ -3505,7 +3505,7 @@
|
||||||
if ( edge->link && FT_ABS( edge->link->pos - edge[-1].pos ) > 16 )
|
if ( edge->link && FT_ABS( edge->link->pos - edge[-1].pos ) > 16 )
|
||||||
{
|
{
|
||||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||||
FT_TRACE5(( " BOUND: edge %d (pos=%.2f) moved to %.2f\n",
|
FT_TRACE5(( " BOUND: edge %ld (pos=%.2f) moved to %.2f\n",
|
||||||
edge - edges,
|
edge - edges,
|
||||||
edge->pos / 64.0,
|
edge->pos / 64.0,
|
||||||
edge[1].pos / 64.0 ));
|
edge[1].pos / 64.0 ));
|
||||||
|
|
|
@ -149,7 +149,7 @@
|
||||||
if ( !af_style_classes[ss] )
|
if ( !af_style_classes[ss] )
|
||||||
{
|
{
|
||||||
FT_TRACE0(( "af_property_set: Invalid value %d for property `%s'\n",
|
FT_TRACE0(( "af_property_set: Invalid value %d for property `%s'\n",
|
||||||
fallback_script, property_name ));
|
*fallback_script, property_name ));
|
||||||
return FT_THROW( Invalid_Argument );
|
return FT_THROW( Invalid_Argument );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -908,13 +908,13 @@
|
||||||
|
|
||||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||||
FT_TRACE5(( "FT_Bitmap_Blend:\n"
|
FT_TRACE5(( "FT_Bitmap_Blend:\n"
|
||||||
" source bitmap: (%d, %d) -- (%d, %d); %d x %d\n",
|
" source bitmap: (%ld, %ld) -- (%ld, %ld); %d x %d\n",
|
||||||
source_llx / 64, source_lly / 64,
|
source_llx / 64, source_lly / 64,
|
||||||
source_urx / 64, source_ury / 64,
|
source_urx / 64, source_ury / 64,
|
||||||
source_->width, source_->rows ));
|
source_->width, source_->rows ));
|
||||||
|
|
||||||
if ( target->width && target->rows )
|
if ( target->width && target->rows )
|
||||||
FT_TRACE5(( " target bitmap: (%d, %d) -- (%d, %d); %d x %d\n",
|
FT_TRACE5(( " target bitmap: (%ld, %ld) -- (%ld, %ld); %d x %d\n",
|
||||||
target_llx / 64, target_lly / 64,
|
target_llx / 64, target_lly / 64,
|
||||||
target_urx / 64, target_ury / 64,
|
target_urx / 64, target_ury / 64,
|
||||||
target->width, target->rows ));
|
target->width, target->rows ));
|
||||||
|
@ -922,7 +922,7 @@
|
||||||
FT_TRACE5(( " target bitmap: empty\n" ));
|
FT_TRACE5(( " target bitmap: empty\n" ));
|
||||||
|
|
||||||
if ( final_width && final_rows )
|
if ( final_width && final_rows )
|
||||||
FT_TRACE5(( " final bitmap: (%d, %d) -- (%d, %d); %d x %d\n",
|
FT_TRACE5(( " final bitmap: (%ld, %ld) -- (%ld, %ld); %d x %d\n",
|
||||||
final_llx / 64, final_lly / 64,
|
final_llx / 64, final_lly / 64,
|
||||||
final_urx / 64, final_ury / 64,
|
final_urx / 64, final_ury / 64,
|
||||||
final_width, final_rows ));
|
final_width, final_rows ));
|
||||||
|
|
|
@ -1841,15 +1841,15 @@
|
||||||
/* FT2 allocator takes signed long buffer length,
|
/* FT2 allocator takes signed long buffer length,
|
||||||
* too large value causing overflow should be checked
|
* too large value causing overflow should be checked
|
||||||
*/
|
*/
|
||||||
FT_TRACE4(( " POST fragment #%d: length=0x%08x"
|
FT_TRACE4(( " POST fragment #%d: length=0x%08lx"
|
||||||
" total pfb_len=0x%08x\n",
|
" total pfb_len=0x%08lx\n",
|
||||||
i, temp, pfb_len + temp + 6 ));
|
i, temp, pfb_len + temp + 6 ));
|
||||||
|
|
||||||
if ( FT_MAC_RFORK_MAX_LEN < temp ||
|
if ( FT_MAC_RFORK_MAX_LEN < temp ||
|
||||||
FT_MAC_RFORK_MAX_LEN - temp < pfb_len + 6 )
|
FT_MAC_RFORK_MAX_LEN - temp < pfb_len + 6 )
|
||||||
{
|
{
|
||||||
FT_TRACE2(( " MacOS resource length cannot exceed"
|
FT_TRACE2(( " MacOS resource length cannot exceed"
|
||||||
" 0x%08x\n",
|
" 0x%08lx\n",
|
||||||
FT_MAC_RFORK_MAX_LEN ));
|
FT_MAC_RFORK_MAX_LEN ));
|
||||||
|
|
||||||
error = FT_THROW( Invalid_Offset );
|
error = FT_THROW( Invalid_Offset );
|
||||||
|
@ -1860,13 +1860,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
FT_TRACE2(( " total buffer size to concatenate"
|
FT_TRACE2(( " total buffer size to concatenate"
|
||||||
" %d POST fragments: 0x%08x\n",
|
" %ld POST fragments: 0x%08lx\n",
|
||||||
resource_cnt, pfb_len + 2 ));
|
resource_cnt, pfb_len + 2 ));
|
||||||
|
|
||||||
if ( pfb_len + 2 < 6 )
|
if ( pfb_len + 2 < 6 )
|
||||||
{
|
{
|
||||||
FT_TRACE2(( " too long fragment length makes"
|
FT_TRACE2(( " too long fragment length makes"
|
||||||
" pfb_len confused: pfb_len=0x%08x\n",
|
" pfb_len confused: pfb_len=0x%08lx\n",
|
||||||
pfb_len ));
|
pfb_len ));
|
||||||
|
|
||||||
error = FT_THROW( Array_Too_Large );
|
error = FT_THROW( Array_Too_Large );
|
||||||
|
@ -1909,7 +1909,7 @@
|
||||||
goto Exit2;
|
goto Exit2;
|
||||||
|
|
||||||
FT_TRACE3(( "POST fragment[%d]:"
|
FT_TRACE3(( "POST fragment[%d]:"
|
||||||
" offsets=0x%08x, rlen=0x%08x, flags=0x%04x\n",
|
" offsets=0x%08lx, rlen=0x%08lx, flags=0x%04x\n",
|
||||||
i, offsets[i], rlen, flags ));
|
i, offsets[i], rlen, flags ));
|
||||||
|
|
||||||
error = FT_ERR( Array_Too_Large );
|
error = FT_ERR( Array_Too_Large );
|
||||||
|
@ -1936,7 +1936,7 @@
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
FT_TRACE3(( " Write POST fragment #%d header (4-byte) to buffer"
|
FT_TRACE3(( " Write POST fragment #%d header (4-byte) to buffer"
|
||||||
" %p + 0x%08x\n",
|
" %p + 0x%08lx\n",
|
||||||
i, pfb_data, pfb_lenpos ));
|
i, pfb_data, pfb_lenpos ));
|
||||||
|
|
||||||
if ( pfb_lenpos + 3 > pfb_len + 2 )
|
if ( pfb_lenpos + 3 > pfb_len + 2 )
|
||||||
|
@ -1951,7 +1951,7 @@
|
||||||
break;
|
break;
|
||||||
|
|
||||||
FT_TRACE3(( " Write POST fragment #%d header (6-byte) to buffer"
|
FT_TRACE3(( " Write POST fragment #%d header (6-byte) to buffer"
|
||||||
" %p + 0x%08x\n",
|
" %p + 0x%08lx\n",
|
||||||
i, pfb_data, pfb_pos ));
|
i, pfb_data, pfb_pos ));
|
||||||
|
|
||||||
if ( pfb_pos + 6 > pfb_len + 2 )
|
if ( pfb_pos + 6 > pfb_len + 2 )
|
||||||
|
@ -1973,8 +1973,8 @@
|
||||||
if ( pfb_pos > pfb_len || pfb_pos + rlen > pfb_len )
|
if ( pfb_pos > pfb_len || pfb_pos + rlen > pfb_len )
|
||||||
goto Exit2;
|
goto Exit2;
|
||||||
|
|
||||||
FT_TRACE3(( " Load POST fragment #%d (%d byte) to buffer"
|
FT_TRACE3(( " Load POST fragment #%d (%ld byte) to buffer"
|
||||||
" %p + 0x%08x\n",
|
" %p + 0x%08lx\n",
|
||||||
i, rlen, pfb_data, pfb_pos ));
|
i, rlen, pfb_data, pfb_pos ));
|
||||||
|
|
||||||
error = FT_Stream_Read( stream, (FT_Byte *)pfb_data + pfb_pos, rlen );
|
error = FT_Stream_Read( stream, (FT_Byte *)pfb_data + pfb_pos, rlen );
|
||||||
|
@ -2259,7 +2259,7 @@
|
||||||
args2.flags = FT_OPEN_PATHNAME;
|
args2.flags = FT_OPEN_PATHNAME;
|
||||||
args2.pathname = file_names[i] ? file_names[i] : args->pathname;
|
args2.pathname = file_names[i] ? file_names[i] : args->pathname;
|
||||||
|
|
||||||
FT_TRACE3(( "Try rule %d: %s (offset=%d) ...",
|
FT_TRACE3(( "Try rule %d: %s (offset=%ld) ...",
|
||||||
i, args2.pathname, offsets[i] ));
|
i, args2.pathname, offsets[i] ));
|
||||||
|
|
||||||
error = FT_Stream_New( library, &args2, &stream2 );
|
error = FT_Stream_New( library, &args2, &stream2 );
|
||||||
|
@ -3214,9 +3214,9 @@
|
||||||
FT_Size_Metrics* metrics = &face->size->metrics;
|
FT_Size_Metrics* metrics = &face->size->metrics;
|
||||||
|
|
||||||
|
|
||||||
FT_TRACE5(( " x scale: %d (%f)\n",
|
FT_TRACE5(( " x scale: %ld (%f)\n",
|
||||||
metrics->x_scale, metrics->x_scale / 65536.0 ));
|
metrics->x_scale, metrics->x_scale / 65536.0 ));
|
||||||
FT_TRACE5(( " y scale: %d (%f)\n",
|
FT_TRACE5(( " y scale: %ld (%f)\n",
|
||||||
metrics->y_scale, metrics->y_scale / 65536.0 ));
|
metrics->y_scale, metrics->y_scale / 65536.0 ));
|
||||||
FT_TRACE5(( " ascender: %f\n", metrics->ascender / 64.0 ));
|
FT_TRACE5(( " ascender: %f\n", metrics->ascender / 64.0 ));
|
||||||
FT_TRACE5(( " descender: %f\n", metrics->descender / 64.0 ));
|
FT_TRACE5(( " descender: %f\n", metrics->descender / 64.0 ));
|
||||||
|
@ -3289,9 +3289,9 @@
|
||||||
FT_Size_Metrics* metrics = &face->size->metrics;
|
FT_Size_Metrics* metrics = &face->size->metrics;
|
||||||
|
|
||||||
|
|
||||||
FT_TRACE5(( " x scale: %d (%f)\n",
|
FT_TRACE5(( " x scale: %ld (%f)\n",
|
||||||
metrics->x_scale, metrics->x_scale / 65536.0 ));
|
metrics->x_scale, metrics->x_scale / 65536.0 ));
|
||||||
FT_TRACE5(( " y scale: %d (%f)\n",
|
FT_TRACE5(( " y scale: %ld (%f)\n",
|
||||||
metrics->y_scale, metrics->y_scale / 65536.0 ));
|
metrics->y_scale, metrics->y_scale / 65536.0 ));
|
||||||
FT_TRACE5(( " ascender: %f\n", metrics->ascender / 64.0 ));
|
FT_TRACE5(( " ascender: %f\n", metrics->ascender / 64.0 ));
|
||||||
FT_TRACE5(( " descender: %f\n", metrics->descender / 64.0 ));
|
FT_TRACE5(( " descender: %f\n", metrics->descender / 64.0 ));
|
||||||
|
@ -3451,7 +3451,7 @@
|
||||||
if ( akerning->x != orig_x_rounded ||
|
if ( akerning->x != orig_x_rounded ||
|
||||||
akerning->y != orig_y_rounded )
|
akerning->y != orig_y_rounded )
|
||||||
FT_TRACE5(( "FT_Get_Kerning: horizontal kerning"
|
FT_TRACE5(( "FT_Get_Kerning: horizontal kerning"
|
||||||
" (%d, %d) scaled down to (%d, %d) pixels\n",
|
" (%ld, %ld) scaled down to (%ld, %ld) pixels\n",
|
||||||
orig_x_rounded / 64, orig_y_rounded / 64,
|
orig_x_rounded / 64, orig_y_rounded / 64,
|
||||||
akerning->x / 64, akerning->y / 64 ));
|
akerning->x / 64, akerning->y / 64 ));
|
||||||
}
|
}
|
||||||
|
@ -3723,7 +3723,7 @@
|
||||||
if ( charcode > 0xFFFFFFFFUL )
|
if ( charcode > 0xFFFFFFFFUL )
|
||||||
{
|
{
|
||||||
FT_TRACE1(( "FT_Get_Char_Index: too large charcode" ));
|
FT_TRACE1(( "FT_Get_Char_Index: too large charcode" ));
|
||||||
FT_TRACE1(( " 0x%x is truncated\n", charcode ));
|
FT_TRACE1(( " 0x%lx is truncated\n", charcode ));
|
||||||
}
|
}
|
||||||
|
|
||||||
result = cmap->clazz->char_index( cmap, (FT_UInt32)charcode );
|
result = cmap->clazz->char_index( cmap, (FT_UInt32)charcode );
|
||||||
|
@ -3899,13 +3899,13 @@
|
||||||
{
|
{
|
||||||
FT_TRACE1(( "FT_Face_GetCharVariantIndex:"
|
FT_TRACE1(( "FT_Face_GetCharVariantIndex:"
|
||||||
" too large charcode" ));
|
" too large charcode" ));
|
||||||
FT_TRACE1(( " 0x%x is truncated\n", charcode ));
|
FT_TRACE1(( " 0x%lx is truncated\n", charcode ));
|
||||||
}
|
}
|
||||||
if ( variantSelector > 0xFFFFFFFFUL )
|
if ( variantSelector > 0xFFFFFFFFUL )
|
||||||
{
|
{
|
||||||
FT_TRACE1(( "FT_Face_GetCharVariantIndex:"
|
FT_TRACE1(( "FT_Face_GetCharVariantIndex:"
|
||||||
" too large variantSelector" ));
|
" too large variantSelector" ));
|
||||||
FT_TRACE1(( " 0x%x is truncated\n", variantSelector ));
|
FT_TRACE1(( " 0x%lx is truncated\n", variantSelector ));
|
||||||
}
|
}
|
||||||
|
|
||||||
result = vcmap->clazz->char_var_index( vcmap, ucmap,
|
result = vcmap->clazz->char_var_index( vcmap, ucmap,
|
||||||
|
@ -3942,13 +3942,13 @@
|
||||||
{
|
{
|
||||||
FT_TRACE1(( "FT_Face_GetCharVariantIsDefault:"
|
FT_TRACE1(( "FT_Face_GetCharVariantIsDefault:"
|
||||||
" too large charcode" ));
|
" too large charcode" ));
|
||||||
FT_TRACE1(( " 0x%x is truncated\n", charcode ));
|
FT_TRACE1(( " 0x%lx is truncated\n", charcode ));
|
||||||
}
|
}
|
||||||
if ( variantSelector > 0xFFFFFFFFUL )
|
if ( variantSelector > 0xFFFFFFFFUL )
|
||||||
{
|
{
|
||||||
FT_TRACE1(( "FT_Face_GetCharVariantIsDefault:"
|
FT_TRACE1(( "FT_Face_GetCharVariantIsDefault:"
|
||||||
" too large variantSelector" ));
|
" too large variantSelector" ));
|
||||||
FT_TRACE1(( " 0x%x is truncated\n", variantSelector ));
|
FT_TRACE1(( " 0x%lx is truncated\n", variantSelector ));
|
||||||
}
|
}
|
||||||
|
|
||||||
result = vcmap->clazz->char_var_default( vcmap,
|
result = vcmap->clazz->char_var_default( vcmap,
|
||||||
|
@ -4011,7 +4011,7 @@
|
||||||
if ( charcode > 0xFFFFFFFFUL )
|
if ( charcode > 0xFFFFFFFFUL )
|
||||||
{
|
{
|
||||||
FT_TRACE1(( "FT_Face_GetVariantsOfChar: too large charcode" ));
|
FT_TRACE1(( "FT_Face_GetVariantsOfChar: too large charcode" ));
|
||||||
FT_TRACE1(( " 0x%x is truncated\n", charcode ));
|
FT_TRACE1(( " 0x%lx is truncated\n", charcode ));
|
||||||
}
|
}
|
||||||
|
|
||||||
result = vcmap->clazz->charvariant_list( vcmap, memory,
|
result = vcmap->clazz->charvariant_list( vcmap, memory,
|
||||||
|
@ -4045,7 +4045,7 @@
|
||||||
if ( variantSelector > 0xFFFFFFFFUL )
|
if ( variantSelector > 0xFFFFFFFFUL )
|
||||||
{
|
{
|
||||||
FT_TRACE1(( "FT_Get_Char_Index: too large variantSelector" ));
|
FT_TRACE1(( "FT_Get_Char_Index: too large variantSelector" ));
|
||||||
FT_TRACE1(( " 0x%x is truncated\n", variantSelector ));
|
FT_TRACE1(( " 0x%lx is truncated\n", variantSelector ));
|
||||||
}
|
}
|
||||||
|
|
||||||
result = vcmap->clazz->variantchar_list( vcmap, memory,
|
result = vcmap->clazz->variantchar_list( vcmap, memory,
|
||||||
|
|
|
@ -239,7 +239,7 @@
|
||||||
(char)( 0xFF & ( tag_internal >> 16 ) ),
|
(char)( 0xFF & ( tag_internal >> 16 ) ),
|
||||||
(char)( 0xFF & ( tag_internal >> 8 ) ),
|
(char)( 0xFF & ( tag_internal >> 8 ) ),
|
||||||
(char)( 0xFF & ( tag_internal >> 0 ) ) ));
|
(char)( 0xFF & ( tag_internal >> 0 ) ) ));
|
||||||
FT_TRACE3(( " : subcount=%d, suboffset=0x%04x\n",
|
FT_TRACE3(( " : subcount=%d, suboffset=0x%04lx\n",
|
||||||
subcnt, rpos ));
|
subcnt, rpos ));
|
||||||
|
|
||||||
if ( tag_internal == tag )
|
if ( tag_internal == tag )
|
||||||
|
@ -285,7 +285,7 @@
|
||||||
ref[j].offset = temp & 0xFFFFFFL;
|
ref[j].offset = temp & 0xFFFFFFL;
|
||||||
|
|
||||||
FT_TRACE3(( " [%d]:"
|
FT_TRACE3(( " [%d]:"
|
||||||
" resource_id=0x%04x, offset=0x%08x\n",
|
" resource_id=0x%04x, offset=0x%08lx\n",
|
||||||
j, (FT_UShort)ref[j].res_id, ref[j].offset ));
|
j, (FT_UShort)ref[j].res_id, ref[j].offset ));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -301,7 +301,7 @@
|
||||||
|
|
||||||
for ( j = 0; j < *count; j++ )
|
for ( j = 0; j < *count; j++ )
|
||||||
FT_TRACE3(( " [%d]:"
|
FT_TRACE3(( " [%d]:"
|
||||||
" resource_id=0x%04x, offset=0x%08x\n",
|
" resource_id=0x%04x, offset=0x%08lx\n",
|
||||||
j, ref[j].res_id, ref[j].offset ));
|
j, ref[j].res_id, ref[j].offset ));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -129,7 +129,7 @@
|
||||||
if ( ( ystr >> 6 ) > FT_INT_MAX || ( ystr >> 6 ) < FT_INT_MIN )
|
if ( ( ystr >> 6 ) > FT_INT_MAX || ( ystr >> 6 ) < FT_INT_MIN )
|
||||||
{
|
{
|
||||||
FT_TRACE1(( "FT_GlyphSlot_Embolden:" ));
|
FT_TRACE1(( "FT_GlyphSlot_Embolden:" ));
|
||||||
FT_TRACE1(( "too strong emboldening parameter ystr=%d\n", ystr ));
|
FT_TRACE1(( "too strong emboldening parameter ystr=%ld\n", ystr ));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
error = FT_GlyphSlot_Own_Bitmap( slot );
|
error = FT_GlyphSlot_Own_Bitmap( slot );
|
||||||
|
|
|
@ -402,10 +402,10 @@ THE SOFTWARE.
|
||||||
bdf_property_t* prop = NULL;
|
bdf_property_t* prop = NULL;
|
||||||
|
|
||||||
|
|
||||||
FT_TRACE4(( " number of glyphs: allocated %d (used %d)\n",
|
FT_TRACE4(( " number of glyphs: allocated %ld (used %ld)\n",
|
||||||
font->glyphs_size,
|
font->glyphs_size,
|
||||||
font->glyphs_used ));
|
font->glyphs_used ));
|
||||||
FT_TRACE4(( " number of unencoded glyphs: allocated %d (used %d)\n",
|
FT_TRACE4(( " number of unencoded glyphs: allocated %ld (used %ld)\n",
|
||||||
font->unencoded_size,
|
font->unencoded_size,
|
||||||
font->unencoded_used ));
|
font->unencoded_used ));
|
||||||
|
|
||||||
|
@ -457,13 +457,13 @@ THE SOFTWARE.
|
||||||
if ( font->font_ascent > 0x7FFF || font->font_ascent < -0x7FFF )
|
if ( font->font_ascent > 0x7FFF || font->font_ascent < -0x7FFF )
|
||||||
{
|
{
|
||||||
font->font_ascent = font->font_ascent < 0 ? -0x7FFF : 0x7FFF;
|
font->font_ascent = font->font_ascent < 0 ? -0x7FFF : 0x7FFF;
|
||||||
FT_TRACE0(( "BDF_Face_Init: clamping font ascent to value %d\n",
|
FT_TRACE0(( "BDF_Face_Init: clamping font ascent to value %ld\n",
|
||||||
font->font_ascent ));
|
font->font_ascent ));
|
||||||
}
|
}
|
||||||
if ( font->font_descent > 0x7FFF || font->font_descent < -0x7FFF )
|
if ( font->font_descent > 0x7FFF || font->font_descent < -0x7FFF )
|
||||||
{
|
{
|
||||||
font->font_descent = font->font_descent < 0 ? -0x7FFF : 0x7FFF;
|
font->font_descent = font->font_descent < 0 ? -0x7FFF : 0x7FFF;
|
||||||
FT_TRACE0(( "BDF_Face_Init: clamping font descent to value %d\n",
|
FT_TRACE0(( "BDF_Face_Init: clamping font descent to value %ld\n",
|
||||||
font->font_descent ));
|
font->font_descent ));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -504,7 +504,7 @@ THE SOFTWARE.
|
||||||
prop->value.l < -0x504C2L )
|
prop->value.l < -0x504C2L )
|
||||||
{
|
{
|
||||||
bsize->size = 0x7FFF;
|
bsize->size = 0x7FFF;
|
||||||
FT_TRACE0(( "BDF_Face_Init: clamping point size to value %d\n",
|
FT_TRACE0(( "BDF_Face_Init: clamping point size to value %ld\n",
|
||||||
bsize->size ));
|
bsize->size ));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -517,7 +517,7 @@ THE SOFTWARE.
|
||||||
if ( font->point_size > 0x7FFF )
|
if ( font->point_size > 0x7FFF )
|
||||||
{
|
{
|
||||||
bsize->size = 0x7FFF;
|
bsize->size = 0x7FFF;
|
||||||
FT_TRACE0(( "BDF_Face_Init: clamping point size to value %d\n",
|
FT_TRACE0(( "BDF_Face_Init: clamping point size to value %ld\n",
|
||||||
bsize->size ));
|
bsize->size ));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -539,7 +539,7 @@ THE SOFTWARE.
|
||||||
if ( prop->value.l > 0x7FFF || prop->value.l < -0x7FFF )
|
if ( prop->value.l > 0x7FFF || prop->value.l < -0x7FFF )
|
||||||
{
|
{
|
||||||
bsize->y_ppem = 0x7FFF << 6;
|
bsize->y_ppem = 0x7FFF << 6;
|
||||||
FT_TRACE0(( "BDF_Face_Init: clamping pixel size to value %d\n",
|
FT_TRACE0(( "BDF_Face_Init: clamping pixel size to value %ld\n",
|
||||||
bsize->y_ppem ));
|
bsize->y_ppem ));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -615,7 +615,7 @@ THE SOFTWARE.
|
||||||
for ( n = 0; n < font->glyphs_size; n++ )
|
for ( n = 0; n < font->glyphs_size; n++ )
|
||||||
{
|
{
|
||||||
(face->en_table[n]).enc = cur[n].encoding;
|
(face->en_table[n]).enc = cur[n].encoding;
|
||||||
FT_TRACE4(( " idx %d, val 0x%lX\n", n, cur[n].encoding ));
|
FT_TRACE4(( " idx %ld, val 0x%lX\n", n, cur[n].encoding ));
|
||||||
(face->en_table[n]).glyph = (FT_UShort)n;
|
(face->en_table[n]).glyph = (FT_UShort)n;
|
||||||
|
|
||||||
if ( cur[n].encoding == font->default_char )
|
if ( cur[n].encoding == font->default_char )
|
||||||
|
@ -624,7 +624,7 @@ THE SOFTWARE.
|
||||||
face->default_glyph = (FT_UInt)n;
|
face->default_glyph = (FT_UInt)n;
|
||||||
else
|
else
|
||||||
FT_TRACE1(( "BDF_Face_Init:"
|
FT_TRACE1(( "BDF_Face_Init:"
|
||||||
" idx %d is too large for this system\n", n ));
|
" idx %ld is too large for this system\n", n ));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -825,7 +825,7 @@ THE SOFTWARE.
|
||||||
bitmap->rows = glyph.bbx.height;
|
bitmap->rows = glyph.bbx.height;
|
||||||
bitmap->width = glyph.bbx.width;
|
bitmap->width = glyph.bbx.width;
|
||||||
if ( glyph.bpr > FT_INT_MAX )
|
if ( glyph.bpr > FT_INT_MAX )
|
||||||
FT_TRACE1(( "BDF_Glyph_Load: too large pitch %d is truncated\n",
|
FT_TRACE1(( "BDF_Glyph_Load: too large pitch %ld is truncated\n",
|
||||||
glyph.bpr ));
|
glyph.bpr ));
|
||||||
bitmap->pitch = (int)glyph.bpr; /* same as FT_Bitmap.pitch */
|
bitmap->pitch = (int)glyph.bpr; /* same as FT_Bitmap.pitch */
|
||||||
|
|
||||||
|
|
|
@ -395,7 +395,7 @@
|
||||||
#if FT_ULONG_MAX > FT_UINT_MAX
|
#if FT_ULONG_MAX > FT_UINT_MAX
|
||||||
if ( load_flags > FT_UINT_MAX )
|
if ( load_flags > FT_UINT_MAX )
|
||||||
FT_TRACE1(( "FTC_ImageCache_LookupScaler:"
|
FT_TRACE1(( "FTC_ImageCache_LookupScaler:"
|
||||||
" higher bits in load_flags 0x%x are dropped\n",
|
" higher bits in load_flags 0x%lx are dropped\n",
|
||||||
load_flags & ~((FT_ULong)FT_UINT_MAX) ));
|
load_flags & ~((FT_ULong)FT_UINT_MAX) ));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -595,7 +595,7 @@
|
||||||
#if FT_ULONG_MAX > FT_UINT_MAX
|
#if FT_ULONG_MAX > FT_UINT_MAX
|
||||||
if ( load_flags > FT_UINT_MAX )
|
if ( load_flags > FT_UINT_MAX )
|
||||||
FT_TRACE1(( "FTC_ImageCache_LookupScaler:"
|
FT_TRACE1(( "FTC_ImageCache_LookupScaler:"
|
||||||
" higher bits in load_flags 0x%x are dropped\n",
|
" higher bits in load_flags 0x%lx are dropped\n",
|
||||||
load_flags & ~((FT_ULong)FT_UINT_MAX) ));
|
load_flags & ~((FT_ULong)FT_UINT_MAX) ));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -737,7 +737,7 @@
|
||||||
{
|
{
|
||||||
if ( dict->cid_supplement < FT_INT_MIN ||
|
if ( dict->cid_supplement < FT_INT_MIN ||
|
||||||
dict->cid_supplement > FT_INT_MAX )
|
dict->cid_supplement > FT_INT_MAX )
|
||||||
FT_TRACE1(( "cff_get_ros: too large supplement %d is truncated\n",
|
FT_TRACE1(( "cff_get_ros: too large supplement %ld is truncated\n",
|
||||||
dict->cid_supplement ));
|
dict->cid_supplement ));
|
||||||
*supplement = (FT_Int)dict->cid_supplement;
|
*supplement = (FT_Int)dict->cid_supplement;
|
||||||
}
|
}
|
||||||
|
|
|
@ -442,7 +442,7 @@
|
||||||
if ( cur_offset != 0 )
|
if ( cur_offset != 0 )
|
||||||
{
|
{
|
||||||
FT_TRACE0(( "cff_index_get_pointers:"
|
FT_TRACE0(( "cff_index_get_pointers:"
|
||||||
" invalid first offset value %d set to zero\n",
|
" invalid first offset value %ld set to zero\n",
|
||||||
cur_offset ));
|
cur_offset ));
|
||||||
cur_offset = 0;
|
cur_offset = 0;
|
||||||
}
|
}
|
||||||
|
@ -559,8 +559,8 @@
|
||||||
idx->data_offset > stream->size - off2 + 1 )
|
idx->data_offset > stream->size - off2 + 1 )
|
||||||
{
|
{
|
||||||
FT_ERROR(( "cff_index_access_element:"
|
FT_ERROR(( "cff_index_access_element:"
|
||||||
" offset to next entry (%d)"
|
" offset to next entry (%ld)"
|
||||||
" exceeds the end of stream (%d)\n",
|
" exceeds the end of stream (%ld)\n",
|
||||||
off2, stream->size - idx->data_offset + 1 ));
|
off2, stream->size - idx->data_offset + 1 ));
|
||||||
off2 = stream->size - idx->data_offset + 1;
|
off2 = stream->size - idx->data_offset + 1;
|
||||||
}
|
}
|
||||||
|
@ -984,7 +984,7 @@
|
||||||
if ( glyph_sid > 0xFFFFL - nleft )
|
if ( glyph_sid > 0xFFFFL - nleft )
|
||||||
{
|
{
|
||||||
FT_ERROR(( "cff_charset_load: invalid SID range trimmed"
|
FT_ERROR(( "cff_charset_load: invalid SID range trimmed"
|
||||||
" nleft=%d -> %d\n", nleft, 0xFFFFL - glyph_sid ));
|
" nleft=%d -> %ld\n", nleft, 0xFFFFL - glyph_sid ));
|
||||||
nleft = ( FT_UInt )( 0xFFFFL - glyph_sid );
|
nleft = ( FT_UInt )( 0xFFFFL - glyph_sid );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1951,7 +1951,7 @@
|
||||||
if ( priv->blue_shift > 1000 || priv->blue_shift < 0 )
|
if ( priv->blue_shift > 1000 || priv->blue_shift < 0 )
|
||||||
{
|
{
|
||||||
FT_TRACE2(( "cff_load_private_dict:"
|
FT_TRACE2(( "cff_load_private_dict:"
|
||||||
" setting unlikely BlueShift value %d to default (7)\n",
|
" setting unlikely BlueShift value %ld to default (7)\n",
|
||||||
priv->blue_shift ));
|
priv->blue_shift ));
|
||||||
priv->blue_shift = 7;
|
priv->blue_shift = 7;
|
||||||
}
|
}
|
||||||
|
@ -1959,7 +1959,7 @@
|
||||||
if ( priv->blue_fuzz > 1000 || priv->blue_fuzz < 0 )
|
if ( priv->blue_fuzz > 1000 || priv->blue_fuzz < 0 )
|
||||||
{
|
{
|
||||||
FT_TRACE2(( "cff_load_private_dict:"
|
FT_TRACE2(( "cff_load_private_dict:"
|
||||||
" setting unlikely BlueFuzz value %d to default (1)\n",
|
" setting unlikely BlueFuzz value %ld to default (1)\n",
|
||||||
priv->blue_fuzz ));
|
priv->blue_fuzz ));
|
||||||
priv->blue_fuzz = 1;
|
priv->blue_fuzz = 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -713,7 +713,7 @@
|
||||||
( max_scaling - min_scaling ) > 9 )
|
( max_scaling - min_scaling ) > 9 )
|
||||||
{
|
{
|
||||||
FT_TRACE1(( "cff_parse_font_matrix:"
|
FT_TRACE1(( "cff_parse_font_matrix:"
|
||||||
" strange scaling values (minimum %d, maximum %d),\n"
|
" strange scaling values (minimum %ld, maximum %ld),\n"
|
||||||
" "
|
" "
|
||||||
" using default matrix\n", min_scaling, max_scaling ));
|
" using default matrix\n", min_scaling, max_scaling ));
|
||||||
goto Unlikely;
|
goto Unlikely;
|
||||||
|
@ -810,7 +810,7 @@
|
||||||
bbox->yMax = FT_RoundFix( cff_parse_fixed( parser, data ) );
|
bbox->yMax = FT_RoundFix( cff_parse_fixed( parser, data ) );
|
||||||
error = FT_Err_Ok;
|
error = FT_Err_Ok;
|
||||||
|
|
||||||
FT_TRACE4(( " [%d %d %d %d]\n",
|
FT_TRACE4(( " [%ld %ld %ld %ld]\n",
|
||||||
bbox->xMin / 65536,
|
bbox->xMin / 65536,
|
||||||
bbox->yMin / 65536,
|
bbox->yMin / 65536,
|
||||||
bbox->xMax / 65536,
|
bbox->xMax / 65536,
|
||||||
|
@ -933,11 +933,11 @@
|
||||||
FT_TRACE1(( "cff_parse_cid_ros: real supplement is rounded\n" ));
|
FT_TRACE1(( "cff_parse_cid_ros: real supplement is rounded\n" ));
|
||||||
dict->cid_supplement = cff_parse_num( parser, data );
|
dict->cid_supplement = cff_parse_num( parser, data );
|
||||||
if ( dict->cid_supplement < 0 )
|
if ( dict->cid_supplement < 0 )
|
||||||
FT_TRACE1(( "cff_parse_cid_ros: negative supplement %d is found\n",
|
FT_TRACE1(( "cff_parse_cid_ros: negative supplement %ld is found\n",
|
||||||
dict->cid_supplement ));
|
dict->cid_supplement ));
|
||||||
error = FT_Err_Ok;
|
error = FT_Err_Ok;
|
||||||
|
|
||||||
FT_TRACE4(( " %d %d %d\n",
|
FT_TRACE4(( " %d %d %ld\n",
|
||||||
dict->cid_registry,
|
dict->cid_registry,
|
||||||
dict->cid_ordering,
|
dict->cid_ordering,
|
||||||
dict->cid_supplement ));
|
dict->cid_supplement ));
|
||||||
|
|
|
@ -254,7 +254,7 @@
|
||||||
goto Exit;
|
goto Exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
FT_TRACE4(( " %d\n", num_dicts ));
|
FT_TRACE4(( " %ld\n", num_dicts ));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* A single entry in the FDArray must (at least) contain the following
|
* A single entry in the FDArray must (at least) contain the following
|
||||||
|
@ -275,7 +275,7 @@
|
||||||
if ( (FT_ULong)num_dicts > stream->size / 100 )
|
if ( (FT_ULong)num_dicts > stream->size / 100 )
|
||||||
{
|
{
|
||||||
FT_TRACE0(( "parse_fd_array: adjusting FDArray size"
|
FT_TRACE0(( "parse_fd_array: adjusting FDArray size"
|
||||||
" (from %d to %d)\n",
|
" (from %ld to %ld)\n",
|
||||||
num_dicts,
|
num_dicts,
|
||||||
stream->size / 100 ));
|
stream->size / 100 ));
|
||||||
num_dicts = (FT_Long)( stream->size / 100 );
|
num_dicts = (FT_Long)( stream->size / 100 );
|
||||||
|
@ -329,7 +329,7 @@
|
||||||
dict->expansion_factor = cid_parser_to_fixed( parser, 0 );
|
dict->expansion_factor = cid_parser_to_fixed( parser, 0 );
|
||||||
dict->private_dict.expansion_factor = dict->expansion_factor;
|
dict->private_dict.expansion_factor = dict->expansion_factor;
|
||||||
|
|
||||||
FT_TRACE4(( "%d\n", dict->expansion_factor ));
|
FT_TRACE4(( "%ld\n", dict->expansion_factor ));
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
@ -804,7 +804,7 @@
|
||||||
face->root.stream->size - parser->data_offset )
|
face->root.stream->size - parser->data_offset )
|
||||||
{
|
{
|
||||||
FT_TRACE0(( "cid_face_open: adjusting length of binary data\n"
|
FT_TRACE0(( "cid_face_open: adjusting length of binary data\n"
|
||||||
" (from %d to %d bytes)\n",
|
" (from %ld to %ld bytes)\n",
|
||||||
parser->binary_length,
|
parser->binary_length,
|
||||||
face->root.stream->size - parser->data_offset ));
|
face->root.stream->size - parser->data_offset ));
|
||||||
parser->binary_length = face->root.stream->size -
|
parser->binary_length = face->root.stream->size -
|
||||||
|
|
|
@ -121,7 +121,7 @@ THE SOFTWARE.
|
||||||
toc->count > 9 )
|
toc->count > 9 )
|
||||||
{
|
{
|
||||||
FT_TRACE0(( "pcf_read_TOC: adjusting number of tables"
|
FT_TRACE0(( "pcf_read_TOC: adjusting number of tables"
|
||||||
" (from %d to %d)\n",
|
" (from %ld to %ld)\n",
|
||||||
toc->count,
|
toc->count,
|
||||||
FT_MIN( stream->size >> 4, 9 ) ));
|
FT_MIN( stream->size >> 4, 9 ) ));
|
||||||
toc->count = FT_MIN( stream->size >> 4, 9 );
|
toc->count = FT_MIN( stream->size >> 4, 9 );
|
||||||
|
@ -241,7 +241,7 @@ THE SOFTWARE.
|
||||||
if ( tables[i].type == (FT_UInt)( 1 << j ) )
|
if ( tables[i].type == (FT_UInt)( 1 << j ) )
|
||||||
name = tableNames[j];
|
name = tableNames[j];
|
||||||
|
|
||||||
FT_TRACE4(( " %d: type=%s, format=0x%X,"
|
FT_TRACE4(( " %d: type=%s, format=0x%lX,"
|
||||||
" size=%ld (0x%lX), offset=%ld (0x%lX)\n",
|
" size=%ld (0x%lX), offset=%ld (0x%lX)\n",
|
||||||
i, name,
|
i, name,
|
||||||
tables[i].format,
|
tables[i].format,
|
||||||
|
@ -660,7 +660,7 @@ THE SOFTWARE.
|
||||||
{
|
{
|
||||||
properties[i].value.l = props[i].value;
|
properties[i].value.l = props[i].value;
|
||||||
|
|
||||||
FT_TRACE4(( " %d\n", properties[i].value.l ));
|
FT_TRACE4(( " %ld\n", properties[i].value.l ));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -797,7 +797,7 @@ THE SOFTWARE.
|
||||||
metrics->descent = 0;
|
metrics->descent = 0;
|
||||||
|
|
||||||
FT_TRACE0(( "pcf_get_metrics:"
|
FT_TRACE0(( "pcf_get_metrics:"
|
||||||
" invalid metrics for glyph %d\n", i ));
|
" invalid metrics for glyph %ld\n", i ));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -917,11 +917,11 @@ THE SOFTWARE.
|
||||||
|
|
||||||
sizebitmaps = bitmapSizes[PCF_GLYPH_PAD_INDEX( format )];
|
sizebitmaps = bitmapSizes[PCF_GLYPH_PAD_INDEX( format )];
|
||||||
|
|
||||||
FT_TRACE4(( " %ld-bit padding implies a size of %lu\n",
|
FT_TRACE4(( " %d-bit padding implies a size of %lu\n",
|
||||||
8 << i, bitmapSizes[i] ));
|
8 << i, bitmapSizes[i] ));
|
||||||
}
|
}
|
||||||
|
|
||||||
FT_TRACE4(( " %lu bitmaps, using %ld-bit padding\n",
|
FT_TRACE4(( " %lu bitmaps, using %d-bit padding\n",
|
||||||
nbitmaps,
|
nbitmaps,
|
||||||
8 << PCF_GLYPH_PAD_INDEX( format ) ));
|
8 << PCF_GLYPH_PAD_INDEX( format ) ));
|
||||||
FT_TRACE4(( " bitmap size: %lu\n", sizebitmaps ));
|
FT_TRACE4(( " bitmap size: %lu\n", sizebitmaps ));
|
||||||
|
@ -1251,13 +1251,13 @@ THE SOFTWARE.
|
||||||
if ( FT_ABS( accel->fontAscent ) > 0x7FFF )
|
if ( FT_ABS( accel->fontAscent ) > 0x7FFF )
|
||||||
{
|
{
|
||||||
accel->fontAscent = accel->fontAscent < 0 ? -0x7FFF : 0x7FFF;
|
accel->fontAscent = accel->fontAscent < 0 ? -0x7FFF : 0x7FFF;
|
||||||
FT_TRACE0(( "pfc_get_accel: clamping font ascent to value %d\n",
|
FT_TRACE0(( "pfc_get_accel: clamping font ascent to value %ld\n",
|
||||||
accel->fontAscent ));
|
accel->fontAscent ));
|
||||||
}
|
}
|
||||||
if ( FT_ABS( accel->fontDescent ) > 0x7FFF )
|
if ( FT_ABS( accel->fontDescent ) > 0x7FFF )
|
||||||
{
|
{
|
||||||
accel->fontDescent = accel->fontDescent < 0 ? -0x7FFF : 0x7FFF;
|
accel->fontDescent = accel->fontDescent < 0 ? -0x7FFF : 0x7FFF;
|
||||||
FT_TRACE0(( "pfc_get_accel: clamping font descent to value %d\n",
|
FT_TRACE0(( "pfc_get_accel: clamping font descent to value %ld\n",
|
||||||
accel->fontDescent ));
|
accel->fontDescent ));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1630,7 +1630,7 @@ THE SOFTWARE.
|
||||||
if ( FT_ABS( prop->value.l ) > 0x504C2L ) /* 0x7FFF * 72270/7200 */
|
if ( FT_ABS( prop->value.l ) > 0x504C2L ) /* 0x7FFF * 72270/7200 */
|
||||||
{
|
{
|
||||||
bsize->size = 0x7FFF;
|
bsize->size = 0x7FFF;
|
||||||
FT_TRACE0(( "pcf_load_font: clamping point size to value %d\n",
|
FT_TRACE0(( "pcf_load_font: clamping point size to value %ld\n",
|
||||||
bsize->size ));
|
bsize->size ));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -1649,7 +1649,7 @@ THE SOFTWARE.
|
||||||
if ( FT_ABS( prop->value.l ) > 0x7FFF )
|
if ( FT_ABS( prop->value.l ) > 0x7FFF )
|
||||||
{
|
{
|
||||||
bsize->y_ppem = 0x7FFF << 6;
|
bsize->y_ppem = 0x7FFF << 6;
|
||||||
FT_TRACE0(( "pcf_load_font: clamping pixel size to value %d\n",
|
FT_TRACE0(( "pcf_load_font: clamping pixel size to value %ld\n",
|
||||||
bsize->y_ppem ));
|
bsize->y_ppem ));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -451,7 +451,7 @@
|
||||||
case 1: /* 16-bit absolute value */
|
case 1: /* 16-bit absolute value */
|
||||||
PFR_CHECK( 2 );
|
PFR_CHECK( 2 );
|
||||||
cur->x = PFR_NEXT_SHORT( p );
|
cur->x = PFR_NEXT_SHORT( p );
|
||||||
FT_TRACE7(( " x.%d", cur->x ));
|
FT_TRACE7(( " x.%ld", cur->x ));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 2: /* 8-bit delta */
|
case 2: /* 8-bit delta */
|
||||||
|
@ -481,7 +481,7 @@
|
||||||
case 1: /* 16-bit absolute value */
|
case 1: /* 16-bit absolute value */
|
||||||
PFR_CHECK( 2 );
|
PFR_CHECK( 2 );
|
||||||
cur->y = PFR_NEXT_SHORT( p );
|
cur->y = PFR_NEXT_SHORT( p );
|
||||||
FT_TRACE7(( " y.%d", cur->y ));
|
FT_TRACE7(( " y.%ld", cur->y ));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 2: /* 8-bit delta */
|
case 2: /* 8-bit delta */
|
||||||
|
|
|
@ -745,7 +745,7 @@
|
||||||
ypos + (FT_Long)ysize < FT_INT_MIN )
|
ypos + (FT_Long)ysize < FT_INT_MIN )
|
||||||
{
|
{
|
||||||
FT_TRACE1(( "pfr_slot_load_bitmap:" ));
|
FT_TRACE1(( "pfr_slot_load_bitmap:" ));
|
||||||
FT_TRACE1(( "huge bitmap glyph %dx%d over FT_GlyphSlot\n",
|
FT_TRACE1(( "huge bitmap glyph %ldx%ld over FT_GlyphSlot\n",
|
||||||
xpos, ypos ));
|
xpos, ypos ));
|
||||||
error = FT_THROW( Invalid_Pixel_Size );
|
error = FT_THROW( Invalid_Pixel_Size );
|
||||||
}
|
}
|
||||||
|
|
|
@ -310,7 +310,7 @@
|
||||||
CF2_Hint hint = &hintmap->edge[i];
|
CF2_Hint hint = &hintmap->edge[i];
|
||||||
|
|
||||||
|
|
||||||
FT_TRACE6(( " %3d %7.2f %7.2f %5d %s%s%s%s\n",
|
FT_TRACE6(( " %3ld %7.2f %7.2f %5d %s%s%s%s\n",
|
||||||
hint->index,
|
hint->index,
|
||||||
hint->csCoord / 65536.0,
|
hint->csCoord / 65536.0,
|
||||||
hint->dsCoord / ( hint->scale * 1.0 ),
|
hint->dsCoord / ( hint->scale * 1.0 ),
|
||||||
|
|
|
@ -1232,7 +1232,7 @@
|
||||||
bbox->xMax = FT_RoundFix( temp[2] );
|
bbox->xMax = FT_RoundFix( temp[2] );
|
||||||
bbox->yMax = FT_RoundFix( temp[3] );
|
bbox->yMax = FT_RoundFix( temp[3] );
|
||||||
|
|
||||||
FT_TRACE4(( " [%d %d %d %d]",
|
FT_TRACE4(( " [%ld %ld %ld %ld]",
|
||||||
bbox->xMin / 65536,
|
bbox->xMin / 65536,
|
||||||
bbox->yMin / 65536,
|
bbox->yMin / 65536,
|
||||||
bbox->xMax / 65536,
|
bbox->xMax / 65536,
|
||||||
|
@ -1286,7 +1286,7 @@
|
||||||
bbox->xMax = FT_RoundFix( temp[i + 2 * max_objects] );
|
bbox->xMax = FT_RoundFix( temp[i + 2 * max_objects] );
|
||||||
bbox->yMax = FT_RoundFix( temp[i + 3 * max_objects] );
|
bbox->yMax = FT_RoundFix( temp[i + 3 * max_objects] );
|
||||||
|
|
||||||
FT_TRACE4(( " [%d %d %d %d]",
|
FT_TRACE4(( " [%ld %ld %ld %ld]",
|
||||||
bbox->xMin / 65536,
|
bbox->xMin / 65536,
|
||||||
bbox->yMin / 65536,
|
bbox->yMin / 65536,
|
||||||
bbox->xMax / 65536,
|
bbox->xMax / 65536,
|
||||||
|
|
|
@ -1727,7 +1727,7 @@
|
||||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||||
if ( bol )
|
if ( bol )
|
||||||
{
|
{
|
||||||
FT_TRACE5(( " (%d)", decoder->top - decoder->stack ));
|
FT_TRACE5(( " (%ld)", decoder->top - decoder->stack ));
|
||||||
bol = FALSE;
|
bol = FALSE;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -1914,7 +1914,7 @@
|
||||||
if ( top - decoder->stack != num_args )
|
if ( top - decoder->stack != num_args )
|
||||||
FT_TRACE0(( "t1_decoder_parse_metrics:"
|
FT_TRACE0(( "t1_decoder_parse_metrics:"
|
||||||
" too much operands on the stack"
|
" too much operands on the stack"
|
||||||
" (seen %d, expected %d)\n",
|
" (seen %ld, expected %d)\n",
|
||||||
top - decoder->stack, num_args ));
|
top - decoder->stack, num_args ));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -874,7 +874,7 @@
|
||||||
if ( error )
|
if ( error )
|
||||||
{
|
{
|
||||||
FT_ERROR(( "ps_hints_stem: could not add stem"
|
FT_ERROR(( "ps_hints_stem: could not add stem"
|
||||||
" (%d,%d) to hints table\n", stems[0], stems[1] ));
|
" (%ld,%ld) to hints table\n", stems[0], stems[1] ));
|
||||||
|
|
||||||
hints->error = error;
|
hints->error = error;
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -673,13 +673,13 @@
|
||||||
if ( overshoot )
|
if ( overshoot )
|
||||||
ras.cProfile->flags |= Overshoot_Bottom;
|
ras.cProfile->flags |= Overshoot_Bottom;
|
||||||
|
|
||||||
FT_TRACE6(( " new ascending profile = %p\n", ras.cProfile ));
|
FT_TRACE6(( " new ascending profile = %p\n", (void *)ras.cProfile ));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case Descending_State:
|
case Descending_State:
|
||||||
if ( overshoot )
|
if ( overshoot )
|
||||||
ras.cProfile->flags |= Overshoot_Top;
|
ras.cProfile->flags |= Overshoot_Top;
|
||||||
FT_TRACE6(( " new descending profile = %p\n", ras.cProfile ));
|
FT_TRACE6(( " new descending profile = %p\n", (void *)ras.cProfile ));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
@ -736,7 +736,7 @@
|
||||||
|
|
||||||
|
|
||||||
FT_TRACE6(( " ending profile %p, start = %ld, height = %ld\n",
|
FT_TRACE6(( " ending profile %p, start = %ld, height = %ld\n",
|
||||||
ras.cProfile, ras.cProfile->start, h ));
|
(void *)ras.cProfile, ras.cProfile->start, h ));
|
||||||
|
|
||||||
ras.cProfile->height = h;
|
ras.cProfile->height = h;
|
||||||
if ( overshoot )
|
if ( overshoot )
|
||||||
|
@ -2273,7 +2273,7 @@
|
||||||
if ( e2 >= ras.bWidth )
|
if ( e2 >= ras.bWidth )
|
||||||
e2 = ras.bWidth - 1;
|
e2 = ras.bWidth - 1;
|
||||||
|
|
||||||
FT_TRACE7(( " -> x=[%d;%d]", e1, e2 ));
|
FT_TRACE7(( " -> x=[%ld;%ld]", e1, e2 ));
|
||||||
|
|
||||||
c1 = (Short)( e1 >> 3 );
|
c1 = (Short)( e1 >> 3 );
|
||||||
c2 = (Short)( e2 >> 3 );
|
c2 = (Short)( e2 >> 3 );
|
||||||
|
@ -2447,7 +2447,7 @@
|
||||||
|
|
||||||
if ( e1 >= 0 && e1 < ras.bWidth )
|
if ( e1 >= 0 && e1 < ras.bWidth )
|
||||||
{
|
{
|
||||||
FT_TRACE7(( " -> x=%d (drop-out)", e1 ));
|
FT_TRACE7(( " -> x=%ld (drop-out)", e1 ));
|
||||||
|
|
||||||
c1 = (Short)( e1 >> 3 );
|
c1 = (Short)( e1 >> 3 );
|
||||||
f1 = (Short)( e1 & 7 );
|
f1 = (Short)( e1 & 7 );
|
||||||
|
@ -2521,7 +2521,7 @@
|
||||||
PByte bits;
|
PByte bits;
|
||||||
|
|
||||||
|
|
||||||
FT_TRACE7(( " -> y=%d (drop-out)", e1 ));
|
FT_TRACE7(( " -> y=%ld (drop-out)", e1 ));
|
||||||
|
|
||||||
bits = ras.bOrigin + ( y >> 3 ) - e1 * ras.target.pitch;
|
bits = ras.bOrigin + ( y >> 3 ) - e1 * ras.target.pitch;
|
||||||
f1 = (Byte)( 0x80 >> ( y & 7 ) );
|
f1 = (Byte)( 0x80 >> ( y & 7 ) );
|
||||||
|
@ -2644,7 +2644,7 @@
|
||||||
|
|
||||||
if ( e1 >= 0 && (ULong)e1 < ras.target.rows )
|
if ( e1 >= 0 && (ULong)e1 < ras.target.rows )
|
||||||
{
|
{
|
||||||
FT_TRACE7(( " -> y=%d (drop-out)", e1 ));
|
FT_TRACE7(( " -> y=%ld (drop-out)", e1 ));
|
||||||
|
|
||||||
bits = ras.bOrigin + ( y >> 3 ) - e1 * ras.target.pitch;
|
bits = ras.bOrigin + ( y >> 3 ) - e1 * ras.target.pitch;
|
||||||
f1 = (Byte)( 0x80 >> ( y & 7 ) );
|
f1 = (Byte)( 0x80 >> ( y & 7 ) );
|
||||||
|
|
|
@ -194,7 +194,7 @@
|
||||||
else if ( (FT_ULong)face->num_glyphs < FT_UINT_MAX )
|
else if ( (FT_ULong)face->num_glyphs < FT_UINT_MAX )
|
||||||
max_gid = (FT_UInt)face->num_glyphs;
|
max_gid = (FT_UInt)face->num_glyphs;
|
||||||
else
|
else
|
||||||
FT_TRACE0(( "Ignore glyph names for invalid GID 0x%08x - 0x%08x\n",
|
FT_TRACE0(( "Ignore glyph names for invalid GID 0x%08x - 0x%08lx\n",
|
||||||
FT_UINT_MAX, face->num_glyphs ));
|
FT_UINT_MAX, face->num_glyphs ));
|
||||||
|
|
||||||
for ( i = 0; i < max_gid; i++ )
|
for ( i = 0; i < max_gid; i++ )
|
||||||
|
|
|
@ -546,8 +546,8 @@
|
||||||
/* Stream may have changed in sfnt_open_font. */
|
/* Stream may have changed in sfnt_open_font. */
|
||||||
stream = face->root.stream;
|
stream = face->root.stream;
|
||||||
|
|
||||||
FT_TRACE2(( "sfnt_init_face: %08p (index %d)\n",
|
FT_TRACE2(( "sfnt_init_face: %p (index %d)\n",
|
||||||
face,
|
(void *)face,
|
||||||
face_instance_index ));
|
face_instance_index ));
|
||||||
|
|
||||||
face_index = FT_ABS( face_instance_index ) & 0xFFFF;
|
face_index = FT_ABS( face_instance_index ) & 0xFFFF;
|
||||||
|
@ -820,7 +820,7 @@
|
||||||
/* it doesn't contain outlines. */
|
/* it doesn't contain outlines. */
|
||||||
/* */
|
/* */
|
||||||
|
|
||||||
FT_TRACE2(( "sfnt_load_face: %08p\n\n", face ));
|
FT_TRACE2(( "sfnt_load_face: %p\n\n", (void *)face ));
|
||||||
|
|
||||||
/* do we have outlines in there? */
|
/* do we have outlines in there? */
|
||||||
#ifdef FT_CONFIG_OPTION_INCREMENTAL
|
#ifdef FT_CONFIG_OPTION_INCREMENTAL
|
||||||
|
|
|
@ -1222,7 +1222,7 @@
|
||||||
FT_TRACE4(( " loca table info:\n" ));
|
FT_TRACE4(( " loca table info:\n" ));
|
||||||
FT_TRACE4(( " dst_offset = %lu\n", info->loca_table->dst_offset ));
|
FT_TRACE4(( " dst_offset = %lu\n", info->loca_table->dst_offset ));
|
||||||
FT_TRACE4(( " dst_length = %lu\n", info->loca_table->dst_length ));
|
FT_TRACE4(( " dst_length = %lu\n", info->loca_table->dst_length ));
|
||||||
FT_TRACE4(( " checksum = %09x\n", *loca_checksum ));
|
FT_TRACE4(( " checksum = %09lx\n", *loca_checksum ));
|
||||||
|
|
||||||
/* Set pointer `sfnt_bytes' to its correct value. */
|
/* Set pointer `sfnt_bytes' to its correct value. */
|
||||||
*sfnt_bytes = sfnt;
|
*sfnt_bytes = sfnt;
|
||||||
|
@ -1573,7 +1573,7 @@
|
||||||
WOFF2_TableRec table = *( indices[nn] );
|
WOFF2_TableRec table = *( indices[nn] );
|
||||||
|
|
||||||
|
|
||||||
FT_TRACE3(( "Seeking to %d with table size %d.\n",
|
FT_TRACE3(( "Seeking to %ld with table size %ld.\n",
|
||||||
table.src_offset, table.src_length ));
|
table.src_offset, table.src_length ));
|
||||||
FT_TRACE3(( "Table tag: %c%c%c%c.\n",
|
FT_TRACE3(( "Table tag: %c%c%c%c.\n",
|
||||||
(FT_Char)( table.Tag >> 24 ),
|
(FT_Char)( table.Tag >> 24 ),
|
||||||
|
@ -1614,7 +1614,7 @@
|
||||||
|
|
||||||
checksum = compute_ULong_sum( transformed_buf + table.src_offset,
|
checksum = compute_ULong_sum( transformed_buf + table.src_offset,
|
||||||
table.src_length );
|
table.src_length );
|
||||||
FT_TRACE4(( "Checksum = %09x.\n", checksum ));
|
FT_TRACE4(( "Checksum = %09lx.\n", checksum ));
|
||||||
|
|
||||||
if ( WRITE_SFNT_BUF( transformed_buf + table.src_offset,
|
if ( WRITE_SFNT_BUF( transformed_buf + table.src_offset,
|
||||||
table.src_length ) )
|
table.src_length ) )
|
||||||
|
@ -1639,7 +1639,7 @@
|
||||||
memory ) )
|
memory ) )
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FT_TRACE4(( "Checksum = %09x.\n", checksum ));
|
FT_TRACE4(( "Checksum = %09lx.\n", checksum ));
|
||||||
}
|
}
|
||||||
|
|
||||||
else if ( table.Tag == TTAG_loca )
|
else if ( table.Tag == TTAG_loca )
|
||||||
|
@ -1715,7 +1715,7 @@
|
||||||
|
|
||||||
WRITE_ULONG( buf_cursor, font_checksum );
|
WRITE_ULONG( buf_cursor, font_checksum );
|
||||||
|
|
||||||
FT_TRACE2(( "Final checksum = %09x.\n", font_checksum ));
|
FT_TRACE2(( "Final checksum = %09lx.\n", font_checksum ));
|
||||||
|
|
||||||
woff2->actual_sfnt_size = dest_offset;
|
woff2->actual_sfnt_size = dest_offset;
|
||||||
|
|
||||||
|
@ -1812,15 +1812,15 @@
|
||||||
if ( FT_STREAM_READ_FIELDS( woff2_header_fields, &woff2 ) )
|
if ( FT_STREAM_READ_FIELDS( woff2_header_fields, &woff2 ) )
|
||||||
return error;
|
return error;
|
||||||
|
|
||||||
FT_TRACE4(( "signature -> 0x%X\n", woff2.signature ));
|
FT_TRACE4(( "signature -> 0x%lX\n", woff2.signature ));
|
||||||
FT_TRACE2(( "flavor -> 0x%08lx\n", woff2.flavor ));
|
FT_TRACE2(( "flavor -> 0x%08lx\n", woff2.flavor ));
|
||||||
FT_TRACE4(( "length -> %lu\n", woff2.length ));
|
FT_TRACE4(( "length -> %lu\n", woff2.length ));
|
||||||
FT_TRACE2(( "num_tables -> %hu\n", woff2.num_tables ));
|
FT_TRACE2(( "num_tables -> %hu\n", woff2.num_tables ));
|
||||||
FT_TRACE4(( "totalSfntSize -> %lu\n", woff2.totalSfntSize ));
|
FT_TRACE4(( "totalSfntSize -> %lu\n", woff2.totalSfntSize ));
|
||||||
FT_TRACE4(( "metaOffset -> %hu\n", woff2.metaOffset ));
|
FT_TRACE4(( "metaOffset -> %lu\n", woff2.metaOffset ));
|
||||||
FT_TRACE4(( "metaLength -> %hu\n", woff2.metaLength ));
|
FT_TRACE4(( "metaLength -> %lu\n", woff2.metaLength ));
|
||||||
FT_TRACE4(( "privOffset -> %hu\n", woff2.privOffset ));
|
FT_TRACE4(( "privOffset -> %lu\n", woff2.privOffset ));
|
||||||
FT_TRACE4(( "privLength -> %hu\n", woff2.privLength ));
|
FT_TRACE4(( "privLength -> %lu\n", woff2.privLength ));
|
||||||
|
|
||||||
/* Make sure we don't recurse back here. */
|
/* Make sure we don't recurse back here. */
|
||||||
if ( woff2.flavor == TTAG_wOF2 )
|
if ( woff2.flavor == TTAG_wOF2 )
|
||||||
|
@ -1980,7 +1980,7 @@
|
||||||
goto Exit;
|
goto Exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
FT_TRACE4(( "Number of fonts in TTC: %ld\n", woff2.num_fonts ));
|
FT_TRACE4(( "Number of fonts in TTC: %d\n", woff2.num_fonts ));
|
||||||
|
|
||||||
if ( FT_NEW_ARRAY( woff2.ttc_fonts, woff2.num_fonts ) )
|
if ( FT_NEW_ARRAY( woff2.ttc_fonts, woff2.num_fonts ) )
|
||||||
goto Exit;
|
goto Exit;
|
||||||
|
@ -1998,7 +1998,7 @@
|
||||||
if ( FT_NEW_ARRAY( ttc_font->table_indices, ttc_font->num_tables ) )
|
if ( FT_NEW_ARRAY( ttc_font->table_indices, ttc_font->num_tables ) )
|
||||||
goto Exit;
|
goto Exit;
|
||||||
|
|
||||||
FT_TRACE5(( "Number of tables in font %d: %ld\n",
|
FT_TRACE5(( "Number of tables in font %d: %d\n",
|
||||||
nn, ttc_font->num_tables ));
|
nn, ttc_font->num_tables ));
|
||||||
|
|
||||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||||
|
|
|
@ -64,8 +64,8 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
FT_TRACE4(( "tt_face_lookup_table: %08p, `%c%c%c%c' -- ",
|
FT_TRACE4(( "tt_face_lookup_table: %p, `%c%c%c%c' -- ",
|
||||||
face,
|
(void *)face,
|
||||||
(FT_Char)( tag >> 24 ),
|
(FT_Char)( tag >> 24 ),
|
||||||
(FT_Char)( tag >> 16 ),
|
(FT_Char)( tag >> 16 ),
|
||||||
(FT_Char)( tag >> 8 ),
|
(FT_Char)( tag >> 8 ),
|
||||||
|
@ -362,7 +362,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
FT_TRACE2(( "tt_face_load_font_dir: %08p\n", face ));
|
FT_TRACE2(( "tt_face_load_font_dir: %p\n", (void *)face ));
|
||||||
|
|
||||||
/* read the offset table */
|
/* read the offset table */
|
||||||
|
|
||||||
|
@ -1314,7 +1314,7 @@
|
||||||
/* we don't load the glyph names, we do that in another */
|
/* we don't load the glyph names, we do that in another */
|
||||||
/* module (ttpost). */
|
/* module (ttpost). */
|
||||||
|
|
||||||
FT_TRACE3(( "FormatType: 0x%x\n", post->FormatType ));
|
FT_TRACE3(( "FormatType: 0x%lx\n", post->FormatType ));
|
||||||
FT_TRACE3(( "isFixedPitch: %s\n", post->isFixedPitch
|
FT_TRACE3(( "isFixedPitch: %s\n", post->isFixedPitch
|
||||||
? " yes" : " no" ));
|
? " yes" : " no" ));
|
||||||
|
|
||||||
|
|
|
@ -239,7 +239,7 @@
|
||||||
break;
|
break;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
FT_TRACE6(( "load_format_20: %d byte left in post table\n",
|
FT_TRACE6(( "load_format_20: %ld byte left in post table\n",
|
||||||
post_limit - FT_STREAM_POS() ));
|
post_limit - FT_STREAM_POS() ));
|
||||||
|
|
||||||
if ( FT_READ_BYTE( len ) )
|
if ( FT_READ_BYTE( len ) )
|
||||||
|
|
|
@ -347,7 +347,7 @@
|
||||||
FT_TRACE2(( "tt_face_load_strike_metrics:"
|
FT_TRACE2(( "tt_face_load_strike_metrics:"
|
||||||
" sanitizing invalid ascender and descender\n"
|
" sanitizing invalid ascender and descender\n"
|
||||||
" "
|
" "
|
||||||
" values for strike %d (%dppem, %dppem)\n",
|
" values for strike %ld (%dppem, %dppem)\n",
|
||||||
strike_index,
|
strike_index,
|
||||||
metrics->x_ppem, metrics->y_ppem ));
|
metrics->x_ppem, metrics->y_ppem ));
|
||||||
|
|
||||||
|
|
|
@ -1648,7 +1648,7 @@ typedef ptrdiff_t FT_PtrDist;
|
||||||
if ( !ras.invalid )
|
if ( !ras.invalid )
|
||||||
gray_record_cell( RAS_VAR );
|
gray_record_cell( RAS_VAR );
|
||||||
|
|
||||||
FT_TRACE7(( "band [%d..%d]: %d cell%s\n",
|
FT_TRACE7(( "band [%d..%d]: %ld cell%s\n",
|
||||||
ras.min_ey,
|
ras.min_ey,
|
||||||
ras.max_ey,
|
ras.max_ey,
|
||||||
ras.num_cells,
|
ras.num_cells,
|
||||||
|
|
|
@ -333,9 +333,9 @@
|
||||||
loader->bbox.yMax = FT_NEXT_SHORT( p );
|
loader->bbox.yMax = FT_NEXT_SHORT( p );
|
||||||
|
|
||||||
FT_TRACE5(( " # of contours: %d\n", loader->n_contours ));
|
FT_TRACE5(( " # of contours: %d\n", loader->n_contours ));
|
||||||
FT_TRACE5(( " xMin: %4d xMax: %4d\n", loader->bbox.xMin,
|
FT_TRACE5(( " xMin: %4ld xMax: %4ld\n", loader->bbox.xMin,
|
||||||
loader->bbox.xMax ));
|
loader->bbox.xMax ));
|
||||||
FT_TRACE5(( " yMin: %4d yMax: %4d\n", loader->bbox.yMin,
|
FT_TRACE5(( " yMin: %4ld yMax: %4ld\n", loader->bbox.yMin,
|
||||||
loader->bbox.yMax ));
|
loader->bbox.yMax ));
|
||||||
loader->cursor = p;
|
loader->cursor = p;
|
||||||
|
|
||||||
|
|
|
@ -293,7 +293,7 @@
|
||||||
FT_Error error;
|
FT_Error error;
|
||||||
|
|
||||||
|
|
||||||
FT_TRACE1(( "Init_Context: new object at 0x%08p\n", exec ));
|
FT_TRACE1(( "Init_Context: new object at %p\n", (void *)exec ));
|
||||||
|
|
||||||
exec->memory = memory;
|
exec->memory = memory;
|
||||||
exec->callSize = 32;
|
exec->callSize = 32;
|
||||||
|
@ -318,7 +318,7 @@
|
||||||
return FT_Err_Ok;
|
return FT_Err_Ok;
|
||||||
|
|
||||||
Fail_Memory:
|
Fail_Memory:
|
||||||
FT_ERROR(( "Init_Context: not enough memory for %p\n", exec ));
|
FT_ERROR(( "Init_Context: not enough memory for %p\n", (void *)exec ));
|
||||||
TT_Done_Context( exec );
|
TT_Done_Context( exec );
|
||||||
|
|
||||||
return error;
|
return error;
|
||||||
|
@ -7845,7 +7845,7 @@
|
||||||
num_twilight_points = 0xFFFFU;
|
num_twilight_points = 0xFFFFU;
|
||||||
|
|
||||||
FT_TRACE5(( "TT_RunIns: Resetting number of twilight points\n"
|
FT_TRACE5(( "TT_RunIns: Resetting number of twilight points\n"
|
||||||
" from %d to the more reasonable value %d\n",
|
" from %d to the more reasonable value %ld\n",
|
||||||
exc->twilight.n_points,
|
exc->twilight.n_points,
|
||||||
num_twilight_points ));
|
num_twilight_points ));
|
||||||
exc->twilight.n_points = (FT_UShort)num_twilight_points;
|
exc->twilight.n_points = (FT_UShort)num_twilight_points;
|
||||||
|
@ -7880,11 +7880,11 @@
|
||||||
exc->loopcall_counter_max = 100 * (FT_ULong)exc->face->root.num_glyphs;
|
exc->loopcall_counter_max = 100 * (FT_ULong)exc->face->root.num_glyphs;
|
||||||
|
|
||||||
FT_TRACE5(( "TT_RunIns: Limiting total number of loops in LOOPCALL"
|
FT_TRACE5(( "TT_RunIns: Limiting total number of loops in LOOPCALL"
|
||||||
" to %d\n", exc->loopcall_counter_max ));
|
" to %ld\n", exc->loopcall_counter_max ));
|
||||||
|
|
||||||
exc->neg_jump_counter_max = exc->loopcall_counter_max;
|
exc->neg_jump_counter_max = exc->loopcall_counter_max;
|
||||||
FT_TRACE5(( "TT_RunIns: Limiting total number of backward jumps"
|
FT_TRACE5(( "TT_RunIns: Limiting total number of backward jumps"
|
||||||
" to %d\n", exc->neg_jump_counter_max ));
|
" to %ld\n", exc->neg_jump_counter_max ));
|
||||||
|
|
||||||
/* set PPEM and CVT functions */
|
/* set PPEM and CVT functions */
|
||||||
exc->tt_metrics.ratio = 0;
|
exc->tt_metrics.ratio = 0;
|
||||||
|
@ -7921,14 +7921,14 @@
|
||||||
/* if tracing level is 7, show current code position */
|
/* if tracing level is 7, show current code position */
|
||||||
/* and the first few stack elements also */
|
/* and the first few stack elements also */
|
||||||
FT_TRACE6(( " " ));
|
FT_TRACE6(( " " ));
|
||||||
FT_TRACE7(( "%06d ", exc->IP ));
|
FT_TRACE7(( "%06ld ", exc->IP ));
|
||||||
FT_TRACE6(( "%s", opcode_name[exc->opcode] + 2 ));
|
FT_TRACE6(( "%s", opcode_name[exc->opcode] + 2 ));
|
||||||
FT_TRACE7(( "%*s", *opcode_name[exc->opcode] == 'A'
|
FT_TRACE7(( "%*s", *opcode_name[exc->opcode] == 'A'
|
||||||
? 2
|
? 2
|
||||||
: 12 - ( *opcode_name[exc->opcode] - '0' ),
|
: 12 - ( *opcode_name[exc->opcode] - '0' ),
|
||||||
"#" ));
|
"#" ));
|
||||||
for ( n = 1; n <= cnt; n++ )
|
for ( n = 1; n <= cnt; n++ )
|
||||||
FT_TRACE7(( " %d", exc->stack[exc->top - n] ));
|
FT_TRACE7(( " %ld", exc->stack[exc->top - n] ));
|
||||||
FT_TRACE6(( "\n" ));
|
FT_TRACE6(( "\n" ));
|
||||||
}
|
}
|
||||||
#endif /* FT_DEBUG_LEVEL_TRACE */
|
#endif /* FT_DEBUG_LEVEL_TRACE */
|
||||||
|
@ -8646,7 +8646,7 @@
|
||||||
} while ( !exc->instruction_trap );
|
} while ( !exc->instruction_trap );
|
||||||
|
|
||||||
LNo_Error_:
|
LNo_Error_:
|
||||||
FT_TRACE4(( " %d instruction%s executed\n",
|
FT_TRACE4(( " %ld instruction%s executed\n",
|
||||||
ins_counter,
|
ins_counter,
|
||||||
ins_counter == 1 ? "" : "s" ));
|
ins_counter == 1 ? "" : "s" ));
|
||||||
return FT_Err_Ok;
|
return FT_Err_Ok;
|
||||||
|
|
|
@ -123,7 +123,7 @@
|
||||||
|
|
||||||
if ( face->num_locations != (FT_ULong)face->root.num_glyphs + 1 )
|
if ( face->num_locations != (FT_ULong)face->root.num_glyphs + 1 )
|
||||||
{
|
{
|
||||||
FT_TRACE2(( "glyph count mismatch! loca: %d, maxp: %d\n",
|
FT_TRACE2(( "glyph count mismatch! loca: %ld, maxp: %ld\n",
|
||||||
face->num_locations - 1, face->root.num_glyphs ));
|
face->num_locations - 1, face->root.num_glyphs ));
|
||||||
|
|
||||||
/* we only handle the case where `maxp' gives a larger value */
|
/* we only handle the case where `maxp' gives a larger value */
|
||||||
|
@ -164,7 +164,7 @@
|
||||||
face->num_locations = (FT_ULong)face->root.num_glyphs + 1;
|
face->num_locations = (FT_ULong)face->root.num_glyphs + 1;
|
||||||
table_len = new_loca_len;
|
table_len = new_loca_len;
|
||||||
|
|
||||||
FT_TRACE2(( "adjusting num_locations to %d\n",
|
FT_TRACE2(( "adjusting num_locations to %ld\n",
|
||||||
face->num_locations ));
|
face->num_locations ));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -172,7 +172,7 @@
|
||||||
face->root.num_glyphs = face->num_locations
|
face->root.num_glyphs = face->num_locations
|
||||||
? (FT_Long)face->num_locations - 1 : 0;
|
? (FT_Long)face->num_locations - 1 : 0;
|
||||||
|
|
||||||
FT_TRACE2(( "adjusting num_glyphs to %d\n",
|
FT_TRACE2(( "adjusting num_glyphs to %ld\n",
|
||||||
face->root.num_glyphs ));
|
face->root.num_glyphs ));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -237,7 +237,7 @@
|
||||||
if ( pos1 > face->glyf_len )
|
if ( pos1 > face->glyf_len )
|
||||||
{
|
{
|
||||||
FT_TRACE1(( "tt_face_get_location:"
|
FT_TRACE1(( "tt_face_get_location:"
|
||||||
" too large offset (0x%08lx) found for glyph index %ld,\n"
|
" too large offset (0x%08lx) found for glyph index %d,\n"
|
||||||
" "
|
" "
|
||||||
" exceeding the end of `glyf' table (0x%08lx)\n",
|
" exceeding the end of `glyf' table (0x%08lx)\n",
|
||||||
pos1, gindex, face->glyf_len ));
|
pos1, gindex, face->glyf_len ));
|
||||||
|
@ -251,7 +251,7 @@
|
||||||
if ( gindex == face->num_locations - 2 )
|
if ( gindex == face->num_locations - 2 )
|
||||||
{
|
{
|
||||||
FT_TRACE1(( "tt_face_get_location:"
|
FT_TRACE1(( "tt_face_get_location:"
|
||||||
" too large size (%ld bytes) found for glyph index %ld,\n"
|
" too large size (%ld bytes) found for glyph index %d,\n"
|
||||||
" "
|
" "
|
||||||
" truncating at the end of `glyf' table to %ld bytes\n",
|
" truncating at the end of `glyf' table to %ld bytes\n",
|
||||||
pos2 - pos1, gindex, face->glyf_len - pos1 ));
|
pos2 - pos1, gindex, face->glyf_len - pos1 ));
|
||||||
|
@ -260,7 +260,7 @@
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
FT_TRACE1(( "tt_face_get_location:"
|
FT_TRACE1(( "tt_face_get_location:"
|
||||||
" too large offset (0x%08lx) found for glyph index %ld,\n"
|
" too large offset (0x%08lx) found for glyph index %d,\n"
|
||||||
" "
|
" "
|
||||||
" exceeding the end of `glyf' table (0x%08lx)\n",
|
" exceeding the end of `glyf' table (0x%08lx)\n",
|
||||||
pos2, gindex + 1, face->glyf_len ));
|
pos2, gindex + 1, face->glyf_len ));
|
||||||
|
@ -428,7 +428,7 @@
|
||||||
if ( FT_FRAME_EXTRACT( table_len, face->font_program ) )
|
if ( FT_FRAME_EXTRACT( table_len, face->font_program ) )
|
||||||
goto Exit;
|
goto Exit;
|
||||||
|
|
||||||
FT_TRACE2(( "loaded, %12d bytes\n", face->font_program_size ));
|
FT_TRACE2(( "loaded, %12ld bytes\n", face->font_program_size ));
|
||||||
}
|
}
|
||||||
|
|
||||||
Exit:
|
Exit:
|
||||||
|
@ -491,7 +491,7 @@
|
||||||
if ( FT_FRAME_EXTRACT( table_len, face->cvt_program ) )
|
if ( FT_FRAME_EXTRACT( table_len, face->cvt_program ) )
|
||||||
goto Exit;
|
goto Exit;
|
||||||
|
|
||||||
FT_TRACE2(( "loaded, %12d bytes\n", face->cvt_program_size ));
|
FT_TRACE2(( "loaded, %12ld bytes\n", face->cvt_program_size ));
|
||||||
}
|
}
|
||||||
|
|
||||||
Exit:
|
Exit:
|
||||||
|
|
|
@ -333,7 +333,7 @@
|
||||||
else
|
else
|
||||||
advances[nn] = 0;
|
advances[nn] = 0;
|
||||||
|
|
||||||
FT_TRACE5(( " idx %d: advance width %d font unit%s\n",
|
FT_TRACE5(( " idx %d: advance width %ld font unit%s\n",
|
||||||
first + nn,
|
first + nn,
|
||||||
advances[nn],
|
advances[nn],
|
||||||
advances[nn] == 1 ? "" : "s" ));
|
advances[nn] == 1 ? "" : "s" ));
|
||||||
|
|
|
@ -1063,7 +1063,7 @@
|
||||||
map->design_points[p] = T1_ToInt( parser );
|
map->design_points[p] = T1_ToInt( parser );
|
||||||
map->blend_points [p] = T1_ToFixed( parser, 0 );
|
map->blend_points [p] = T1_ToFixed( parser, 0 );
|
||||||
|
|
||||||
FT_TRACE4(( " [%d %f]",
|
FT_TRACE4(( " [%ld %f]",
|
||||||
map->design_points[p],
|
map->design_points[p],
|
||||||
(double)map->blend_points[p] / 65536 ));
|
(double)map->blend_points[p] / 65536 ));
|
||||||
}
|
}
|
||||||
|
@ -1755,7 +1755,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
FT_TRACE0(( "parse_subrs: adjusting number of subroutines"
|
FT_TRACE0(( "parse_subrs: adjusting number of subroutines"
|
||||||
" (from %d to %d)\n",
|
" (from %d to %ld)\n",
|
||||||
num_subrs,
|
num_subrs,
|
||||||
( parser->root.limit - parser->root.cursor ) >> 3 ));
|
( parser->root.limit - parser->root.cursor ) >> 3 ));
|
||||||
num_subrs = ( parser->root.limit - parser->root.cursor ) >> 3;
|
num_subrs = ( parser->root.limit - parser->root.cursor ) >> 3;
|
||||||
|
@ -1926,7 +1926,7 @@
|
||||||
if ( num_glyphs > ( limit - cur ) >> 3 )
|
if ( num_glyphs > ( limit - cur ) >> 3 )
|
||||||
{
|
{
|
||||||
FT_TRACE0(( "parse_charstrings: adjusting number of glyphs"
|
FT_TRACE0(( "parse_charstrings: adjusting number of glyphs"
|
||||||
" (from %d to %d)\n",
|
" (from %d to %ld)\n",
|
||||||
num_glyphs, ( limit - cur ) >> 3 ));
|
num_glyphs, ( limit - cur ) >> 3 ));
|
||||||
num_glyphs = ( limit - cur ) >> 3;
|
num_glyphs = ( limit - cur ) >> 3;
|
||||||
}
|
}
|
||||||
|
|
|
@ -346,8 +346,8 @@
|
||||||
if ( error )
|
if ( error )
|
||||||
goto Exit;
|
goto Exit;
|
||||||
|
|
||||||
FT_TRACE2(( "T1_Face_Init: %08p (index %d)\n",
|
FT_TRACE2(( "T1_Face_Init: %p (index %d)\n",
|
||||||
face,
|
(void *)face,
|
||||||
face_index ));
|
face_index ));
|
||||||
|
|
||||||
/* if we just wanted to check the format, leave successfully now */
|
/* if we just wanted to check the format, leave successfully now */
|
||||||
|
|
|
@ -826,7 +826,7 @@
|
||||||
if ( loader->num_glyphs > ( limit - parser->root.cursor ) >> 2 )
|
if ( loader->num_glyphs > ( limit - parser->root.cursor ) >> 2 )
|
||||||
{
|
{
|
||||||
FT_TRACE0(( "t42_parse_charstrings: adjusting number of glyphs"
|
FT_TRACE0(( "t42_parse_charstrings: adjusting number of glyphs"
|
||||||
" (from %d to %d)\n",
|
" (from %d to %ld)\n",
|
||||||
loader->num_glyphs,
|
loader->num_glyphs,
|
||||||
( limit - parser->root.cursor ) >> 2 ));
|
( limit - parser->root.cursor ) >> 2 ));
|
||||||
loader->num_glyphs = ( limit - parser->root.cursor ) >> 2;
|
loader->num_glyphs = ( limit - parser->root.cursor ) >> 2;
|
||||||
|
|
Loading…
Reference in New Issue