* src/*: Don't use more than one '\n' in FT_TRACE
and FT_ERROR
.
This ensures good logging output, with all lines having a proper prefix (if requested).
This commit is contained in:
parent
74822f64b0
commit
a6adb25626
@ -1,3 +1,10 @@
|
||||
2020-12-02 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
* src/*: Don't use more than one '\n' in `FT_TRACE` and `FT_ERROR`.
|
||||
|
||||
This ensures good logging output, with all lines having a proper
|
||||
prefix (if requested).
|
||||
|
||||
2020-12-02 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
[base] Don't close 'stderr' after logging.
|
||||
|
@ -96,6 +96,9 @@ FT_BEGIN_HEADER
|
||||
* Each component must define the macro FT_COMPONENT to a valid FT_Trace
|
||||
* value before using any TRACE macro.
|
||||
*
|
||||
* To get consistent logging output, there should be no newline character
|
||||
* (i.e., '\n') or a single trailing one in the message string of
|
||||
* `FT_TRACEx` and `FT_ERROR`.
|
||||
*/
|
||||
|
||||
|
||||
@ -104,7 +107,6 @@ FT_BEGIN_HEADER
|
||||
* If FT_LOGGING is enabled, tracing messages are sent to dlg's API.
|
||||
* If FT_LOGGING is disabled, tracing messages are sent to `FT_Message`
|
||||
* (defined in ftdebug.c).
|
||||
*
|
||||
*/
|
||||
#ifdef FT_LOGGING
|
||||
|
||||
|
@ -72,11 +72,11 @@
|
||||
AF_GlyphHintsRec hints[1];
|
||||
|
||||
|
||||
FT_TRACE5(( "\n"
|
||||
"cjk standard widths computation (style `%s')\n"
|
||||
"===================================================\n"
|
||||
"\n",
|
||||
FT_TRACE5(( "\n" ));
|
||||
FT_TRACE5(( "cjk standard widths computation (style `%s')\n",
|
||||
af_style_names[metrics->root.style_class->style] ));
|
||||
FT_TRACE5(( "===================================================\n" ));
|
||||
FT_TRACE5(( "\n" ));
|
||||
|
||||
af_glyph_hints_init( hints, face->memory );
|
||||
|
||||
@ -314,9 +314,9 @@
|
||||
/* style's entry in the `af_blue_stringset' array, computing its */
|
||||
/* extremum points (depending on the string properties) */
|
||||
|
||||
FT_TRACE5(( "cjk blue zones computation\n"
|
||||
"==========================\n"
|
||||
"\n" ));
|
||||
FT_TRACE5(( "cjk blue zones computation\n" ));
|
||||
FT_TRACE5(( "==========================\n" ));
|
||||
FT_TRACE5(( "\n" ));
|
||||
|
||||
#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ
|
||||
shaper_buf = af_shaper_buf_create( face );
|
||||
@ -555,9 +555,8 @@
|
||||
if ( AF_CJK_IS_TOP_BLUE( bs ) )
|
||||
blue->flags |= AF_CJK_BLUE_TOP;
|
||||
|
||||
FT_TRACE5(( " -> reference = %ld\n"
|
||||
" overshoot = %ld\n",
|
||||
*blue_ref, *blue_shoot ));
|
||||
FT_TRACE5(( " -> reference = %ld\n", *blue_ref ));
|
||||
FT_TRACE5(( " overshoot = %ld\n", *blue_shoot ));
|
||||
|
||||
} /* end for loop */
|
||||
|
||||
@ -743,12 +742,12 @@
|
||||
|
||||
blue->shoot.fit = blue->ref.fit - delta2;
|
||||
|
||||
FT_TRACE5(( ">> active cjk blue zone %c%d[%ld/%ld]:\n"
|
||||
" ref: cur=%.2f fit=%.2f\n"
|
||||
" shoot: cur=%.2f fit=%.2f\n",
|
||||
FT_TRACE5(( ">> active cjk blue zone %c%d[%ld/%ld]:\n",
|
||||
( dim == AF_DIMENSION_HORZ ) ? 'H' : 'V',
|
||||
nn, blue->ref.org, blue->shoot.org,
|
||||
blue->ref.cur / 64.0, blue->ref.fit / 64.0,
|
||||
nn, blue->ref.org, blue->shoot.org ));
|
||||
FT_TRACE5(( " ref: cur=%.2f fit=%.2f\n",
|
||||
blue->ref.cur / 64.0, blue->ref.fit / 64.0 ));
|
||||
FT_TRACE5(( " shoot: cur=%.2f fit=%.2f\n",
|
||||
blue->shoot.cur / 64.0, blue->shoot.fit / 64.0 ));
|
||||
|
||||
blue->flags |= AF_CJK_BLUE_ACTIVE;
|
||||
|
@ -285,10 +285,10 @@
|
||||
|
||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||
|
||||
FT_TRACE4(( "\n"
|
||||
"style coverage\n"
|
||||
"==============\n"
|
||||
"\n" ));
|
||||
FT_TRACE4(( "\n" ));
|
||||
FT_TRACE4(( "style coverage\n" ));
|
||||
FT_TRACE4(( "==============\n" ));
|
||||
FT_TRACE4(( "\n" ));
|
||||
|
||||
for ( ss = 0; af_style_classes[ss]; ss++ )
|
||||
{
|
||||
|
@ -63,11 +63,11 @@
|
||||
AF_GlyphHintsRec hints[1];
|
||||
|
||||
|
||||
FT_TRACE5(( "\n"
|
||||
"latin standard widths computation (style `%s')\n"
|
||||
"=====================================================\n"
|
||||
"\n",
|
||||
FT_TRACE5(( "\n" ));
|
||||
FT_TRACE5(( "latin standard widths computation (style `%s')\n",
|
||||
af_style_names[metrics->root.style_class->style] ));
|
||||
FT_TRACE5(( "=====================================================\n" ));
|
||||
FT_TRACE5(( "\n" ));
|
||||
|
||||
af_glyph_hints_init( hints, face->memory );
|
||||
|
||||
@ -350,9 +350,9 @@
|
||||
/* we walk over the blue character strings as specified in the */
|
||||
/* style's entry in the `af_blue_stringset' array */
|
||||
|
||||
FT_TRACE5(( "latin blue zones computation\n"
|
||||
"============================\n"
|
||||
"\n" ));
|
||||
FT_TRACE5(( "latin blue zones computation\n" ));
|
||||
FT_TRACE5(( "============================\n" ));
|
||||
FT_TRACE5(( "\n" ));
|
||||
|
||||
#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ
|
||||
shaper_buf = af_shaper_buf_create( face );
|
||||
@ -976,9 +976,8 @@
|
||||
if ( AF_LATIN_IS_X_HEIGHT_BLUE( bs ) )
|
||||
blue->flags |= AF_LATIN_BLUE_ADJUSTMENT;
|
||||
|
||||
FT_TRACE5(( " -> reference = %ld\n"
|
||||
" overshoot = %ld\n",
|
||||
*blue_ref, *blue_shoot ));
|
||||
FT_TRACE5(( " -> reference = %ld\n", *blue_ref ));
|
||||
FT_TRACE5(( " overshoot = %ld\n", *blue_shoot ));
|
||||
|
||||
} /* end for loop */
|
||||
|
||||
@ -1346,9 +1345,9 @@
|
||||
|
||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||
if ( axis->extra_light )
|
||||
FT_TRACE5(( "`%s' style is extra light (at current resolution)\n"
|
||||
"\n",
|
||||
FT_TRACE5(( "`%s' style is extra light (at current resolution)\n",
|
||||
af_style_names[metrics->root.style_class->style] ));
|
||||
FT_TRACE5(( "\n" ));
|
||||
#endif
|
||||
|
||||
if ( dim == AF_DIMENSION_VERT )
|
||||
@ -1473,13 +1472,13 @@
|
||||
AF_LatinBlue blue = &axis->blues[nn];
|
||||
|
||||
|
||||
FT_TRACE5(( " reference %d: %ld scaled to %.2f%s\n"
|
||||
" overshoot %d: %ld scaled to %.2f%s\n",
|
||||
FT_TRACE5(( " reference %d: %ld scaled to %.2f%s\n",
|
||||
nn,
|
||||
blue->ref.org,
|
||||
blue->ref.fit / 64.0,
|
||||
( blue->flags & AF_LATIN_BLUE_ACTIVE ) ? ""
|
||||
: " (inactive)",
|
||||
: " (inactive)" ));
|
||||
FT_TRACE5(( " overshoot %d: %ld scaled to %.2f%s\n",
|
||||
nn,
|
||||
blue->shoot.org,
|
||||
blue->shoot.fit / 64.0,
|
||||
|
@ -208,8 +208,9 @@
|
||||
/* 'af_latin2_blue_chars[blues]' string, then compute its top-most or */
|
||||
/* bottom-most points (depending on `AF_IS_TOP_BLUE') */
|
||||
|
||||
FT_TRACE5(( "blue zones computation\n"
|
||||
"======================\n\n" ));
|
||||
FT_TRACE5(( "blue zones computation\n" ));
|
||||
FT_TRACE5(( "======================\n" ));
|
||||
FT_TRACE5(( "\n" ));
|
||||
|
||||
for ( bb = 0; bb < AF_LATIN_BLUE_MAX; bb++ )
|
||||
{
|
||||
@ -426,9 +427,8 @@
|
||||
if ( AF_LATIN_IS_X_HEIGHT_BLUE( bb ) )
|
||||
blue->flags |= AF_LATIN_BLUE_ADJUSTMENT;
|
||||
|
||||
FT_TRACE5(( " -> reference = %ld\n"
|
||||
" overshoot = %ld\n",
|
||||
*blue_ref, *blue_shoot ));
|
||||
FT_TRACE5(( " -> reference = %ld\n", *blue_ref ));
|
||||
FT_TRACE5(( " overshoot = %ld\n", *blue_shoot ));
|
||||
}
|
||||
|
||||
return;
|
||||
|
@ -173,9 +173,9 @@
|
||||
if ( hb_set_is_empty( gsub_lookups ) )
|
||||
goto Exit; /* nothing to do */
|
||||
|
||||
FT_TRACE4(( "GSUB lookups (style `%s'):\n"
|
||||
" ",
|
||||
FT_TRACE4(( "GSUB lookups (style `%s'):\n",
|
||||
af_style_names[style_class->style] ));
|
||||
FT_TRACE4(( " " ));
|
||||
|
||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||
count = 0;
|
||||
@ -202,12 +202,13 @@
|
||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||
if ( !count )
|
||||
FT_TRACE4(( " (none)" ));
|
||||
FT_TRACE4(( "\n\n" ));
|
||||
FT_TRACE4(( "\n" ));
|
||||
FT_TRACE4(( "\n" ));
|
||||
#endif
|
||||
|
||||
FT_TRACE4(( "GPOS lookups (style `%s'):\n"
|
||||
" ",
|
||||
FT_TRACE4(( "GPOS lookups (style `%s'):\n",
|
||||
af_style_names[style_class->style] ));
|
||||
FT_TRACE4(( " " ));
|
||||
|
||||
gpos_lookups = hb_set_create();
|
||||
hb_ot_layout_collect_lookups( face,
|
||||
@ -242,7 +243,8 @@
|
||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||
if ( !count )
|
||||
FT_TRACE4(( " (none)" ));
|
||||
FT_TRACE4(( "\n\n" ));
|
||||
FT_TRACE4(( "\n" ));
|
||||
FT_TRACE4(( "\n" ));
|
||||
#endif
|
||||
|
||||
/*
|
||||
@ -353,8 +355,10 @@
|
||||
{
|
||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||
if ( !( count % 10 ) )
|
||||
FT_TRACE4(( "\n"
|
||||
" " ));
|
||||
{
|
||||
FT_TRACE4(( "\n" ));
|
||||
FT_TRACE4(( " " ));
|
||||
}
|
||||
|
||||
FT_TRACE4(( " %d", idx ));
|
||||
count++;
|
||||
@ -376,9 +380,12 @@
|
||||
|
||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||
if ( !count )
|
||||
FT_TRACE4(( "\n"
|
||||
" (none)" ));
|
||||
FT_TRACE4(( "\n\n" ));
|
||||
{
|
||||
FT_TRACE4(( "\n" ));
|
||||
FT_TRACE4(( " (none)" ));
|
||||
}
|
||||
FT_TRACE4(( "\n" ));
|
||||
FT_TRACE4(( "\n" ));
|
||||
#endif
|
||||
|
||||
Exit:
|
||||
|
@ -106,10 +106,10 @@
|
||||
|
||||
if ( idx_min < 0 || idx_min > idx_max || idx_max > 64 )
|
||||
{
|
||||
FT_TRACE5(( "invalid indices:\n"
|
||||
" min=%d max=%d, xx1=%ld xx2=%ld,\n"
|
||||
" x1min=%ld x1max=%ld, x2min=%ld x2max=%ld\n",
|
||||
idx_min, idx_max, xx1, xx2,
|
||||
FT_TRACE5(( "invalid indices:\n" ));
|
||||
FT_TRACE5(( " min=%d max=%d, xx1=%ld xx2=%ld,\n",
|
||||
idx_min, idx_max, xx1, xx2 ));
|
||||
FT_TRACE5(( " x1min=%ld x1max=%ld, x2min=%ld x2max=%ld\n",
|
||||
warper->x1min, warper->x1max,
|
||||
warper->x2min, warper->x2max ));
|
||||
return;
|
||||
|
@ -907,8 +907,8 @@
|
||||
final_rows = ( final_ury - final_lly ) >> 6;
|
||||
|
||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||
FT_TRACE5(( "FT_Bitmap_Blend:\n"
|
||||
" source bitmap: (%ld, %ld) -- (%ld, %ld); %d x %d\n",
|
||||
FT_TRACE5(( "FT_Bitmap_Blend:\n" ));
|
||||
FT_TRACE5(( " source bitmap: (%ld, %ld) -- (%ld, %ld); %d x %d\n",
|
||||
source_llx / 64, source_lly / 64,
|
||||
source_urx / 64, source_ury / 64,
|
||||
source_->width, source_->rows ));
|
||||
|
@ -2681,10 +2681,10 @@
|
||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||
if ( !error && face_index < 0 )
|
||||
{
|
||||
FT_TRACE3(( "FT_Open_Face: The font has %ld face%s\n"
|
||||
" and %ld named instance%s for face %ld\n",
|
||||
FT_TRACE3(( "FT_Open_Face: The font has %ld face%s\n",
|
||||
face->num_faces,
|
||||
face->num_faces == 1 ? "" : "s",
|
||||
face->num_faces == 1 ? "" : "s" ));
|
||||
FT_TRACE3(( " and %ld named instance%s for face %ld\n",
|
||||
face->style_flags >> 16,
|
||||
( face->style_flags >> 16 ) == 1 ? "" : "s",
|
||||
-face_index - 1 ));
|
||||
|
@ -1018,8 +1018,8 @@
|
||||
case 0:
|
||||
if ( num_glyphs > 229 )
|
||||
{
|
||||
FT_ERROR(( "cff_charset_load: implicit charset larger than\n"
|
||||
"predefined charset (Adobe ISO-Latin)\n" ));
|
||||
FT_ERROR(( "cff_charset_load: implicit charset larger than\n" ));
|
||||
FT_ERROR(( "predefined charset (Adobe ISO-Latin)\n" ));
|
||||
error = FT_THROW( Invalid_File_Format );
|
||||
goto Exit;
|
||||
}
|
||||
@ -1036,8 +1036,8 @@
|
||||
case 1:
|
||||
if ( num_glyphs > 166 )
|
||||
{
|
||||
FT_ERROR(( "cff_charset_load: implicit charset larger than\n"
|
||||
"predefined charset (Adobe Expert)\n" ));
|
||||
FT_ERROR(( "cff_charset_load: implicit charset larger than\n" ));
|
||||
FT_ERROR(( "predefined charset (Adobe Expert)\n" ));
|
||||
error = FT_THROW( Invalid_File_Format );
|
||||
goto Exit;
|
||||
}
|
||||
@ -1054,8 +1054,8 @@
|
||||
case 2:
|
||||
if ( num_glyphs > 87 )
|
||||
{
|
||||
FT_ERROR(( "cff_charset_load: implicit charset larger than\n"
|
||||
"predefined charset (Adobe Expert Subset)\n" ));
|
||||
FT_ERROR(( "cff_charset_load: implicit charset larger than\n" ));
|
||||
FT_ERROR(( "predefined charset (Adobe Expert Subset)\n" ));
|
||||
error = FT_THROW( Invalid_File_Format );
|
||||
goto Exit;
|
||||
}
|
||||
@ -1456,10 +1456,8 @@
|
||||
if ( master == 0 )
|
||||
{
|
||||
blend->BV[master] = FT_FIXED_ONE;
|
||||
FT_TRACE4(( " build blend vector len %d\n"
|
||||
" [ %f ",
|
||||
len,
|
||||
blend->BV[master] / 65536.0 ));
|
||||
FT_TRACE4(( " build blend vector len %d\n", len ));
|
||||
FT_TRACE4(( " [ %f ", blend->BV[master] / 65536.0 ));
|
||||
continue;
|
||||
}
|
||||
|
||||
|
@ -803,8 +803,8 @@
|
||||
if ( parser->binary_length >
|
||||
face->root.stream->size - parser->data_offset )
|
||||
{
|
||||
FT_TRACE0(( "cid_face_open: adjusting length of binary data\n"
|
||||
" (from %ld to %ld bytes)\n",
|
||||
FT_TRACE0(( "cid_face_open: adjusting length of binary data\n" ));
|
||||
FT_TRACE0(( " (from %ld to %ld bytes)\n",
|
||||
parser->binary_length,
|
||||
face->root.stream->size - parser->data_offset ));
|
||||
parser->binary_length = face->root.stream->size -
|
||||
|
@ -1493,9 +1493,11 @@
|
||||
state = (FT_UShort)( newState_idx / ( 1 + maxClassID ) );
|
||||
if ( 0 != ( newState_idx % ( 1 + maxClassID ) ) )
|
||||
{
|
||||
FT_TRACE4(( "-> new state = %d (supposed)\n"
|
||||
"but newState index 0x%04x is not aligned to %d-classes\n",
|
||||
state, newState_idx, 1 + maxClassID ));
|
||||
FT_TRACE4(( "-> new state = %d (supposed)\n",
|
||||
state ));
|
||||
FT_TRACE4(( "but newState index 0x%04x"
|
||||
" is not aligned to %d-classes\n",
|
||||
newState_idx, 1 + maxClassID ));
|
||||
GXV_SET_ERR_IF_PARANOID( FT_INVALID_OFFSET );
|
||||
}
|
||||
|
||||
|
@ -501,8 +501,8 @@ THE SOFTWARE.
|
||||
if ( FT_READ_ULONG_LE( format ) )
|
||||
goto Bail;
|
||||
|
||||
FT_TRACE4(( "pcf_get_properties:\n"
|
||||
" format: 0x%lX (%s)\n",
|
||||
FT_TRACE4(( "pcf_get_properties:\n" ));
|
||||
FT_TRACE4(( " format: 0x%lX (%s)\n",
|
||||
format,
|
||||
PCF_BYTE_ORDER( format ) == MSBFirst ? "MSB" : "LSB" ));
|
||||
|
||||
@ -697,8 +697,8 @@ THE SOFTWARE.
|
||||
if ( FT_READ_ULONG_LE( format ) )
|
||||
goto Bail;
|
||||
|
||||
FT_TRACE4(( "pcf_get_metrics:\n"
|
||||
" format: 0x%lX (%s, %s)\n",
|
||||
FT_TRACE4(( "pcf_get_metrics:\n" ));
|
||||
FT_TRACE4(( " format: 0x%lX (%s, %s)\n",
|
||||
format,
|
||||
PCF_BYTE_ORDER( format ) == MSBFirst ? "MSB" : "LSB",
|
||||
PCF_FORMAT_MATCH( format, PCF_COMPRESSED_METRICS ) ?
|
||||
@ -840,17 +840,16 @@ THE SOFTWARE.
|
||||
|
||||
FT_Stream_ExitFrame( stream );
|
||||
|
||||
FT_TRACE4(( "pcf_get_bitmaps:\n"
|
||||
" format: 0x%lX\n"
|
||||
" (%s, %s,\n"
|
||||
" padding=%d bit%s, scanning=%d bit%s)\n",
|
||||
format,
|
||||
FT_TRACE4(( "pcf_get_bitmaps:\n" ));
|
||||
FT_TRACE4(( " format: 0x%lX\n", format ));
|
||||
FT_TRACE4(( " (%s, %s,\n",
|
||||
PCF_BYTE_ORDER( format ) == MSBFirst
|
||||
? "most significant byte first"
|
||||
: "least significant byte first",
|
||||
PCF_BIT_ORDER( format ) == MSBFirst
|
||||
? "most significant bit first"
|
||||
: "least significant bit first",
|
||||
: "least significant bit first" ));
|
||||
FT_TRACE4(( " padding=%d bit%s, scanning=%d bit%s)\n",
|
||||
8 << PCF_GLYPH_PAD_INDEX( format ),
|
||||
( 8 << PCF_GLYPH_PAD_INDEX( format ) ) == 1 ? "" : "s",
|
||||
8 << PCF_SCAN_UNIT_INDEX( format ),
|
||||
@ -1001,8 +1000,8 @@ THE SOFTWARE.
|
||||
if ( FT_READ_ULONG_LE( format ) )
|
||||
goto Bail;
|
||||
|
||||
FT_TRACE4(( "pcf_get_encodings:\n"
|
||||
" format: 0x%lX (%s)\n",
|
||||
FT_TRACE4(( "pcf_get_encodings:\n" ));
|
||||
FT_TRACE4(( " format: 0x%lX (%s)\n",
|
||||
format,
|
||||
PCF_BYTE_ORDER( format ) == MSBFirst ? "MSB" : "LSB" ));
|
||||
|
||||
@ -1021,11 +1020,11 @@ THE SOFTWARE.
|
||||
goto Bail;
|
||||
}
|
||||
|
||||
FT_TRACE4(( " firstCol 0x%X, lastCol 0x%X\n"
|
||||
" firstRow 0x%X, lastRow 0x%X\n"
|
||||
" defaultChar 0x%X\n",
|
||||
enc->firstCol, enc->lastCol,
|
||||
enc->firstRow, enc->lastRow,
|
||||
FT_TRACE4(( " firstCol 0x%X, lastCol 0x%X\n",
|
||||
enc->firstCol, enc->lastCol ));
|
||||
FT_TRACE4(( " firstRow 0x%X, lastRow 0x%X\n",
|
||||
enc->firstRow, enc->lastRow ));
|
||||
FT_TRACE4(( " defaultChar 0x%X\n",
|
||||
enc->defaultChar ));
|
||||
|
||||
/* sanity checks; we limit numbers of rows and columns to 256 */
|
||||
@ -1208,10 +1207,10 @@ THE SOFTWARE.
|
||||
if ( FT_READ_ULONG_LE( format ) )
|
||||
goto Bail;
|
||||
|
||||
FT_TRACE4(( "pcf_get_accel%s:\n"
|
||||
" format: 0x%lX (%s, %s)\n",
|
||||
FT_TRACE4(( "pcf_get_accel%s:\n",
|
||||
type == PCF_BDF_ACCELERATORS ? " (getting BDF accelerators)"
|
||||
: "",
|
||||
: "" ));
|
||||
FT_TRACE4(( " format: 0x%lX (%s, %s)\n",
|
||||
format,
|
||||
PCF_BYTE_ORDER( format ) == MSBFirst ? "MSB" : "LSB",
|
||||
PCF_FORMAT_MATCH( format, PCF_ACCEL_W_INKBOUNDS ) ?
|
||||
|
@ -2271,7 +2271,8 @@
|
||||
|
||||
} /* while ip < limit */
|
||||
|
||||
FT_TRACE4(( "..end..\n\n" ));
|
||||
FT_TRACE4(( "..end..\n" ));
|
||||
FT_TRACE4(( "\n" ));
|
||||
|
||||
Fail:
|
||||
return error;
|
||||
|
@ -1650,7 +1650,8 @@
|
||||
|
||||
} /* while ip < limit */
|
||||
|
||||
FT_TRACE4(( "..end..\n\n" ));
|
||||
FT_TRACE4(( "..end..\n" ));
|
||||
FT_TRACE4(( "\n" ));
|
||||
|
||||
Fail:
|
||||
return error;
|
||||
@ -2070,7 +2071,8 @@
|
||||
|
||||
} /* while ip < limit */
|
||||
|
||||
FT_TRACE4(( "..end..\n\n" ));
|
||||
FT_TRACE4(( "..end..\n" ));
|
||||
FT_TRACE4(( "\n" ));
|
||||
|
||||
No_Width:
|
||||
FT_ERROR(( "t1_decoder_parse_metrics:"
|
||||
|
@ -820,7 +820,8 @@
|
||||
/* it doesn't contain outlines. */
|
||||
/* */
|
||||
|
||||
FT_TRACE2(( "sfnt_load_face: %p\n\n", (void *)face ));
|
||||
FT_TRACE2(( "sfnt_load_face: %p\n", (void *)face ));
|
||||
FT_TRACE2(( "\n" ));
|
||||
|
||||
/* do we have outlines in there? */
|
||||
#ifdef FT_CONFIG_OPTION_INCREMENTAL
|
||||
|
@ -198,9 +198,9 @@
|
||||
FT_NEW_ARRAY( indices, woff.num_tables ) )
|
||||
goto Exit;
|
||||
|
||||
FT_TRACE2(( "\n"
|
||||
" tag offset compLen origLen checksum\n"
|
||||
" -------------------------------------------\n" ));
|
||||
FT_TRACE2(( "\n" ));
|
||||
FT_TRACE2(( " tag offset compLen origLen checksum\n" ));
|
||||
FT_TRACE2(( " -------------------------------------------\n" ));
|
||||
|
||||
if ( FT_FRAME_ENTER( 20L * woff.num_tables ) )
|
||||
goto Exit;
|
||||
|
@ -416,9 +416,9 @@
|
||||
FT_FRAME_ENTER( sfnt.num_tables * 16L ) )
|
||||
goto Exit;
|
||||
|
||||
FT_TRACE2(( "\n"
|
||||
" tag offset length checksum\n"
|
||||
" ----------------------------------\n" ));
|
||||
FT_TRACE2(( "\n" ));
|
||||
FT_TRACE2(( " tag offset length checksum\n" ));
|
||||
FT_TRACE2(( " ----------------------------------\n" ));
|
||||
|
||||
valid_entries = 0;
|
||||
for ( nn = 0; nn < sfnt.num_tables; nn++ )
|
||||
@ -505,7 +505,8 @@
|
||||
|
||||
FT_FRAME_EXIT();
|
||||
|
||||
FT_TRACE2(( "table directory loaded\n\n" ));
|
||||
FT_TRACE2(( "table directory loaded\n" ));
|
||||
FT_TRACE2(( "\n" ));
|
||||
|
||||
Exit:
|
||||
return error;
|
||||
|
@ -736,12 +736,14 @@
|
||||
subglyph->transform.xx / 65536.0,
|
||||
subglyph->transform.yy / 65536.0 ));
|
||||
else if ( subglyph->flags & WE_HAVE_A_2X2 )
|
||||
FT_TRACE7(( " scaling: xx=%f, yx=%f\n"
|
||||
" xy=%f, yy=%f\n",
|
||||
{
|
||||
FT_TRACE7(( " scaling: xx=%f, yx=%f\n",
|
||||
subglyph->transform.xx / 65536.0,
|
||||
subglyph->transform.yx / 65536.0,
|
||||
subglyph->transform.yx / 65536.0 ));
|
||||
FT_TRACE7(( " xy=%f, yy=%f\n",
|
||||
subglyph->transform.xy / 65536.0,
|
||||
subglyph->transform.yy / 65536.0 ));
|
||||
}
|
||||
|
||||
subglyph++;
|
||||
}
|
||||
|
@ -371,8 +371,9 @@
|
||||
|
||||
if ( axisCount != (FT_Long)blend->mmvar->num_axis )
|
||||
{
|
||||
FT_TRACE2(( "ft_var_load_avar: number of axes in `avar' and `fvar'\n"
|
||||
" table are different\n" ));
|
||||
FT_TRACE2(( "ft_var_load_avar:"
|
||||
" number of axes in `avar' and `fvar'\n" ));
|
||||
FT_TRACE2(( " table are different\n" ));
|
||||
goto Exit;
|
||||
}
|
||||
|
||||
@ -1524,8 +1525,9 @@
|
||||
|
||||
if ( gvar_head.axisCount != (FT_UShort)blend->mmvar->num_axis )
|
||||
{
|
||||
FT_TRACE1(( "ft_var_load_gvar: number of axes in `gvar' and `cvar'\n"
|
||||
" table are different\n" ));
|
||||
FT_TRACE1(( "ft_var_load_gvar:"
|
||||
" number of axes in `gvar' and `cvar'\n" ));
|
||||
FT_TRACE1(( " table are different\n" ));
|
||||
error = FT_THROW( Invalid_Table );
|
||||
goto Exit;
|
||||
}
|
||||
@ -2124,8 +2126,8 @@
|
||||
if ( FT_SET_ERROR( face->goto_table( face, TTAG_CFF2,
|
||||
stream, &table_len ) ) )
|
||||
{
|
||||
FT_TRACE1(( "\n"
|
||||
"TT_Get_MM_Var: `gvar' or `CFF2' table is missing\n" ));
|
||||
FT_TRACE1(( "\n" ));
|
||||
FT_TRACE1(( "TT_Get_MM_Var: `gvar' or `CFF2' table is missing\n" ));
|
||||
goto Exit;
|
||||
}
|
||||
}
|
||||
@ -2553,17 +2555,17 @@
|
||||
num_coords = mmvar->num_axis;
|
||||
}
|
||||
|
||||
FT_TRACE5(( "TT_Set_MM_Blend:\n"
|
||||
" normalized design coordinates:\n" ));
|
||||
FT_TRACE5(( "TT_Set_MM_Blend:\n" ));
|
||||
FT_TRACE5(( " normalized design coordinates:\n" ));
|
||||
|
||||
for ( i = 0; i < num_coords; i++ )
|
||||
{
|
||||
FT_TRACE5(( " %.5f\n", coords[i] / 65536.0 ));
|
||||
if ( coords[i] < -0x00010000L || coords[i] > 0x00010000L )
|
||||
{
|
||||
FT_TRACE1(( "TT_Set_MM_Blend: normalized design coordinate %.5f\n"
|
||||
" is out of range [-1;1]\n",
|
||||
FT_TRACE1(( "TT_Set_MM_Blend: normalized design coordinate %.5f\n",
|
||||
coords[i] / 65536.0 ));
|
||||
FT_TRACE1(( " is out of range [-1;1]\n" ));
|
||||
error = FT_THROW( Invalid_Argument );
|
||||
goto Exit;
|
||||
}
|
||||
@ -2961,8 +2963,8 @@
|
||||
if ( !face->blend->avar_loaded )
|
||||
ft_var_load_avar( face );
|
||||
|
||||
FT_TRACE5(( "TT_Set_Var_Design:\n"
|
||||
" normalized design coordinates:\n" ));
|
||||
FT_TRACE5(( "TT_Set_Var_Design:\n" ));
|
||||
FT_TRACE5(( " normalized design coordinates:\n" ));
|
||||
ft_var_to_normalized( face, num_coords, blend->coords, normalized );
|
||||
|
||||
error = tt_set_mm_blend( face, mmvar->num_axis, normalized, 0 );
|
||||
@ -3238,16 +3240,16 @@
|
||||
|
||||
if ( !blend )
|
||||
{
|
||||
FT_TRACE2(( "\n"
|
||||
"tt_face_vary_cvt: no blend specified\n" ));
|
||||
FT_TRACE2(( "\n" ));
|
||||
FT_TRACE2(( "tt_face_vary_cvt: no blend specified\n" ));
|
||||
error = FT_Err_Ok;
|
||||
goto Exit;
|
||||
}
|
||||
|
||||
if ( !face->cvt )
|
||||
{
|
||||
FT_TRACE2(( "\n"
|
||||
"tt_face_vary_cvt: no `cvt ' table\n" ));
|
||||
FT_TRACE2(( "\n" ));
|
||||
FT_TRACE2(( "tt_face_vary_cvt: no `cvt ' table\n" ));
|
||||
error = FT_Err_Ok;
|
||||
goto Exit;
|
||||
}
|
||||
|
@ -7781,8 +7781,8 @@
|
||||
if ( num_twilight_points > 0xFFFFU )
|
||||
num_twilight_points = 0xFFFFU;
|
||||
|
||||
FT_TRACE5(( "TT_RunIns: Resetting number of twilight points\n"
|
||||
" from %d to the more reasonable value %ld\n",
|
||||
FT_TRACE5(( "TT_RunIns: Resetting number of twilight points\n" ));
|
||||
FT_TRACE5(( " from %d to the more reasonable value %ld\n",
|
||||
exc->twilight.n_points,
|
||||
num_twilight_points ));
|
||||
exc->twilight.n_points = (FT_UShort)num_twilight_points;
|
||||
|
Loading…
Reference in New Issue
Block a user