[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 2e3dec5: Debugging improvements.
From: |
Werner LEMBERG |
Subject: |
[freetype2] master 2e3dec5: Debugging improvements. |
Date: |
Wed, 8 Aug 2018 07:51:35 -0400 (EDT) |
branch: master
commit 2e3dec55093d7853bf741e24a3d5d4c6c4d68ced
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
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'.
---
ChangeLog | 10 ++++++++++
src/base/ftobjs.c | 60 +++++++++++++++++++++++++++----------------------------
2 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 268420e..91bb37a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2018-08-08 Werner Lemberg <address@hidden>
+
+ 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 <address@hidden>
[pcf] Massive unsigning (part 2).
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index dfae22f..3742bf2 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -79,6 +79,18 @@
#pragma warning( pop )
#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 */
@@ -1012,34 +1024,19 @@
}
#ifdef FT_DEBUG_LEVEL_TRACE
- {
- 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"
- };
-
-
- 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 ));
- }
+ 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
Exit:
@@ -4653,8 +4650,11 @@
int pitch = bitmap.pitch;
- FT_TRACE3(( "FT_Render_Glyph: bitmap %dx%d, mode %d\n",
- rows, pitch, slot->bitmap.pixel_mode ));
+ FT_TRACE3(( "FT_Render_Glyph: bitmap %dx%d, %s (mode %d)\n",
+ pitch,
+ rows,
+ pixel_modes[slot->bitmap.pixel_mode],
+ slot->bitmap.pixel_mode ));
for ( i = 0; i < rows; i++ )
for ( j = 0; j < pitch; j++ )
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 2e3dec5: Debugging improvements.,
Werner LEMBERG <=