diff --git a/ChangeLog b/ChangeLog index 80a485588..29ec53b6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2018-08-26 Werner Lemberg + + Minor tracing adjustments. + + * src/base/ftstream.c (FT_Stream_EnterFrame, FT_Stream_ExitFrame): + Trace. + + * src/truetype/ttgload.c (TT_Access_Glyph_Frame): Remove tracing. + 2018-08-26 Werner Lemberg [truetype] Avoid nested frames. diff --git a/src/base/ftstream.c b/src/base/ftstream.c index ab9546c0a..a3d3639a8 100644 --- a/src/base/ftstream.c +++ b/src/base/ftstream.c @@ -239,6 +239,8 @@ FT_ULong read_bytes; + FT_TRACE7(( "FT_Stream_EnterFrame: %ld bytes\n", count )); + /* check for nested frame access */ FT_ASSERT( stream && stream->cursor == 0 ); @@ -323,7 +325,9 @@ /* In this case, the loader code handles the 0-length table */ /* gracefully; however, stream.cursor is really set to 0 by the */ /* FT_Stream_EnterFrame() call, and this is not an error. */ - /* */ + + FT_TRACE7(( "FT_Stream_ExitFrame\n" )); + FT_ASSERT( stream ); if ( stream->read ) diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c index b59e978cf..ad93c0418 100644 --- a/src/truetype/ttgload.c +++ b/src/truetype/ttgload.c @@ -282,12 +282,9 @@ FT_Error error; FT_Stream stream = loader->stream; - /* for non-debug mode */ FT_UNUSED( glyph_index ); - FT_TRACE4(( "Glyph %ld\n", glyph_index )); - /* the following line sets the `error' variable through macros! */ if ( FT_STREAM_SEEK( offset ) || FT_FRAME_ENTER( byte_count ) ) return error;