diff options
| author | Werner Lemberg <wl@gnu.org> | 2018-01-27 09:33:17 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2018-01-27 10:15:58 +0100 |
| commit | 50f693a78b0da3ee03cec04f48e8a0f0ea34a34d (patch) | |
| tree | 2b565022830ebe4ece3b9b43d051b38dbf00a33c | |
| parent | 994eb2b34934bc5face9f83b2d3b12cf7a9262ab (diff) | |
| download | freetype2-50f693a78b0da3ee03cec04f48e8a0f0ea34a34d.tar.gz | |
[truetype] Beautify tracing of VF axis records.
* src/truetype/ttgxvar.c (TT_Get_MM_Var): Show axis records in a
table-like manner.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/truetype/ttgxvar.c | 33 |
2 files changed, 31 insertions, 9 deletions
@@ -1,3 +1,10 @@ +2018-01-27 Werner Lemberg <wl@gnu.org> + + [truetype] Beautify tracing of VF axis records. + + * src/truetype/ttgxvar.c (TT_Get_MM_Var): Show axis records in a + table-like manner. + 2018-01-26 Ben Wagner <bungeman@google.com> [truetype] Fix multiple calls of `FT_Get_MM_Var' (#52955). diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c index 980086ce7..d765184b6 100644 --- a/src/truetype/ttgxvar.c +++ b/src/truetype/ttgxvar.c @@ -2043,7 +2043,9 @@ FT_TRACE2(( "loaded\n" )); - FT_TRACE5(( "number of GX style axes: %d\n", fvar_head.axisCount )); + FT_TRACE5(( "%d variation ax%s\n", + fvar_head.axisCount, + fvar_head.axisCount == 1 ? "is" : "es" )); if ( FT_NEW( face->blend ) ) goto Exit; @@ -2143,6 +2145,10 @@ { GX_FVar_Axis axis_rec; +#ifdef FT_DEBUG_LEVEL_TRACE + int invalid = 0; +#endif + if ( FT_STREAM_READ_FIELDS( fvaraxis_fields, &axis_rec ) ) goto Exit; @@ -2163,22 +2169,31 @@ if ( a->minimum > a->def || a->def > a->maximum ) { - FT_TRACE2(( "TT_Get_MM_Var:" - " invalid \"%s\" axis record; disabling\n", - a->name )); - a->minimum = a->def; a->maximum = a->def; + +#ifdef FT_DEBUG_LEVEL_TRACE + invalid = 1; +#endif } - FT_TRACE5(( " \"%s\":" - " minimum=%.5f, default=%.5f, maximum=%.5f," - " flags=0x%04X\n", +#ifdef FT_DEBUG_LEVEL_TRACE + if ( i == 0 ) + FT_TRACE5(( " idx tag " + /* " XXX `XXXX'" */ + " minimum default maximum flags\n" )); + /* " XXXX.XXXXX XXXX.XXXXX XXXX.XXXXX 0xXXXX" */ + + FT_TRACE5(( " %3d `%s'" + " %10.5f %10.5f %10.5f 0x%04X%s\n", + i, a->name, a->minimum / 65536.0, a->def / 65536.0, a->maximum / 65536.0, - *axis_flags )); + *axis_flags, + invalid ? " (invalid, disabled)" : "" )); +#endif a++; axis_flags++; |