* src/base/ftobjs.c (FT_Render_Glyph_Internal): Improve tracing.

This commit is contained in:
Werner Lemberg 2018-08-10 05:41:32 +02:00
parent c8ef0fd07c
commit 1aa73fa83d
2 changed files with 43 additions and 32 deletions

View File

@ -1,3 +1,7 @@
2018-08-10 Werner Lemberg <wl@gnu.org>
* src/base/ftobjs.c (FT_Render_Glyph_Internal): Improve tracing.
2018-08-10 Werner Lemberg <wl@gnu.org> 2018-08-10 Werner Lemberg <wl@gnu.org>
Fix clang warnings. Fix clang warnings.

View File

@ -4683,44 +4683,51 @@
/* we use FT_TRACE7 in this block */ /* we use FT_TRACE7 in this block */
if ( !error && if ( !error &&
ft_trace_levels[trace_checksum] >= 7 && ft_trace_levels[trace_checksum] >= 7 )
slot->bitmap.rows < 128U &&
slot->bitmap.width < 128U &&
slot->bitmap.buffer )
{ {
int rows = (int)slot->bitmap.rows; if ( slot->bitmap.rows < 128U &&
int width = (int)slot->bitmap.width; slot->bitmap.width < 128U &&
int pitch = slot->bitmap.pitch; slot->bitmap.buffer )
int i, j, m;
unsigned char* topleft = slot->bitmap.buffer;
if ( pitch < 0 )
topleft -= pitch * ( rows - 1 );
FT_TRACE7(( "Netpbm image: start\n" ));
switch ( slot->bitmap.pixel_mode )
{ {
case FT_PIXEL_MODE_MONO: int rows = (int)slot->bitmap.rows;
FT_TRACE7(( "P1 %d %d\n", width, rows )); int width = (int)slot->bitmap.width;
for ( i = 0; i < rows; i++ ) int pitch = slot->bitmap.pitch;
{ int i, j, m;
for ( j = 0; j < width; )
for ( m = 128; m > 0 && j < width; m >>= 1, j++ )
FT_TRACE7(( " %d", ( topleft[i * pitch + j / 8] & m ) != 0 ));
FT_TRACE7(( "\n" ));
}
break;
default: unsigned char* topleft = slot->bitmap.buffer;
FT_TRACE7(( "P2 %d %d 255\n", width, rows ));
for ( i = 0; i < rows; i++ )
if ( pitch < 0 )
topleft -= pitch * ( rows - 1 );
FT_TRACE7(( "Netpbm image: start\n" ));
switch ( slot->bitmap.pixel_mode )
{ {
for ( j = 0; j < width; j += 1 ) case FT_PIXEL_MODE_MONO:
FT_TRACE7(( " %3u", topleft[i * pitch + j] )); FT_TRACE7(( "P1 %d %d\n", width, rows ));
FT_TRACE7(( "\n" )); for ( i = 0; i < rows; i++ )
{
for ( j = 0; j < width; )
for ( m = 128; m > 0 && j < width; m >>= 1, j++ )
FT_TRACE7(( " %d",
( topleft[i * pitch + j / 8] & m ) != 0 ));
FT_TRACE7(( "\n" ));
}
break;
default:
FT_TRACE7(( "P2 %d %d 255\n", width, rows ));
for ( i = 0; i < rows; i++ )
{
for ( j = 0; j < width; j += 1 )
FT_TRACE7(( " %3u", topleft[i * pitch + j] ));
FT_TRACE7(( "\n" ));
}
} }
FT_TRACE7(( "Netpbm image: end\n" ));
} }
FT_TRACE7(( "Netpbm image: end\n" )); else
FT_TRACE7(( "Netpbm image: too large, omitted\n" ));
} }
#undef FT_COMPONENT #undef FT_COMPONENT