Debugging improvements.
* src/base/ftobjs.c (pixel_modes): Move this array to top level from ... (FT_Load_Glyph): ... here. (FT_Render_Glyph_Internal): Use `width' x `height' in trace message. Use `pixel_modes'.
This commit is contained in:
parent
c633378a5e
commit
2e3dec5509
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
||||||
|
2018-08-08 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
Debugging improvements.
|
||||||
|
|
||||||
|
* src/base/ftobjs.c (pixel_modes): Move this array to top level
|
||||||
|
from ...
|
||||||
|
(FT_Load_Glyph): ... here.
|
||||||
|
(FT_Render_Glyph_Internal): Use `width' x `height' in trace message.
|
||||||
|
Use `pixel_modes'.
|
||||||
|
|
||||||
2018-08-08 Alexei Podtelezhnikov <apodtele@gmail.com>
|
2018-08-08 Alexei Podtelezhnikov <apodtele@gmail.com>
|
||||||
|
|
||||||
[pcf] Massive unsigning (part 2).
|
[pcf] Massive unsigning (part 2).
|
||||||
|
|
|
@ -79,6 +79,18 @@
|
||||||
#pragma warning( pop )
|
#pragma warning( pop )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
static const char* const pixel_modes[] =
|
||||||
|
{
|
||||||
|
"none",
|
||||||
|
"monochrome bitmap",
|
||||||
|
"gray 8-bit bitmap",
|
||||||
|
"gray 2-bit bitmap",
|
||||||
|
"gray 4-bit bitmap",
|
||||||
|
"LCD 8-bit bitmap",
|
||||||
|
"vertical LCD 8-bit bitmap",
|
||||||
|
"BGRA 32-bit color image bitmap"
|
||||||
|
};
|
||||||
|
|
||||||
#endif /* FT_DEBUG_LEVEL_TRACE */
|
#endif /* FT_DEBUG_LEVEL_TRACE */
|
||||||
|
|
||||||
|
|
||||||
|
@ -1012,34 +1024,19 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef FT_DEBUG_LEVEL_TRACE
|
#ifdef FT_DEBUG_LEVEL_TRACE
|
||||||
{
|
FT_TRACE5(( "FT_Load_Glyph: index %d, flags 0x%x\n",
|
||||||
static const char* const pixel_modes[] =
|
glyph_index, load_flags ));
|
||||||
{
|
FT_TRACE5(( " x advance: %f\n", slot->advance.x / 64.0 ));
|
||||||
"none",
|
FT_TRACE5(( " y advance: %f\n", slot->advance.y / 64.0 ));
|
||||||
"monochrome bitmap",
|
FT_TRACE5(( " linear x advance: %f\n",
|
||||||
"gray 8-bit bitmap",
|
slot->linearHoriAdvance / 65536.0 ));
|
||||||
"gray 2-bit bitmap",
|
FT_TRACE5(( " linear y advance: %f\n",
|
||||||
"gray 4-bit bitmap",
|
slot->linearVertAdvance / 65536.0 ));
|
||||||
"LCD 8-bit bitmap",
|
FT_TRACE5(( " bitmap %dx%d, %s (mode %d)\n",
|
||||||
"vertical LCD 8-bit bitmap",
|
slot->bitmap.width,
|
||||||
"BGRA 32-bit color image bitmap"
|
slot->bitmap.rows,
|
||||||
};
|
pixel_modes[slot->bitmap.pixel_mode],
|
||||||
|
slot->bitmap.pixel_mode ));
|
||||||
|
|
||||||
FT_TRACE5(( "FT_Load_Glyph: index %d, flags 0x%x\n",
|
|
||||||
glyph_index, load_flags ));
|
|
||||||
FT_TRACE5(( " x advance: %f\n", slot->advance.x / 64.0 ));
|
|
||||||
FT_TRACE5(( " y advance: %f\n", slot->advance.y / 64.0 ));
|
|
||||||
FT_TRACE5(( " linear x advance: %f\n",
|
|
||||||
slot->linearHoriAdvance / 65536.0 ));
|
|
||||||
FT_TRACE5(( " linear y advance: %f\n",
|
|
||||||
slot->linearVertAdvance / 65536.0 ));
|
|
||||||
FT_TRACE5(( " bitmap %dx%d, %s (mode %d)\n",
|
|
||||||
slot->bitmap.width,
|
|
||||||
slot->bitmap.rows,
|
|
||||||
pixel_modes[slot->bitmap.pixel_mode],
|
|
||||||
slot->bitmap.pixel_mode ));
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
Exit:
|
Exit:
|
||||||
|
@ -4653,8 +4650,11 @@
|
||||||
int pitch = bitmap.pitch;
|
int pitch = bitmap.pitch;
|
||||||
|
|
||||||
|
|
||||||
FT_TRACE3(( "FT_Render_Glyph: bitmap %dx%d, mode %d\n",
|
FT_TRACE3(( "FT_Render_Glyph: bitmap %dx%d, %s (mode %d)\n",
|
||||||
rows, pitch, slot->bitmap.pixel_mode ));
|
pitch,
|
||||||
|
rows,
|
||||||
|
pixel_modes[slot->bitmap.pixel_mode],
|
||||||
|
slot->bitmap.pixel_mode ));
|
||||||
|
|
||||||
for ( i = 0; i < rows; i++ )
|
for ( i = 0; i < rows; i++ )
|
||||||
for ( j = 0; j < pitch; j++ )
|
for ( j = 0; j < pitch; j++ )
|
||||||
|
|
Loading…
Reference in New Issue