Commit 4e8f9de9a0a583db2c9d67e7e25f223f3cbc474e
2011-05-12T14:30:15
[autofit] Make trace message for CJK bluezone more verbose.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93
diff --git a/ChangeLog b/ChangeLog
index ae9c017..a5197a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-12 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
+ [autofit] Make trace message for CJK bluezone more verbose.
+
2011-05-08 Just Fill Bugs <mozbugbox@yahoo.com.au>
suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c
index 0180e3d..d7670f4 100644
--- a/src/autofit/afcjk.c
+++ b/src/autofit/afcjk.c
@@ -280,6 +280,13 @@
AF_CJKAxis axis;
FT_GlyphSlot glyph = face->glyph;
+#ifdef FT_DEBUG_LEVEL_TRACE
+ FT_String* cjk_blue_name[AF_CJK_BLUE_MAX] = { "top", "bottom",
+ "left", "right" };
+ FT_String* cjk_blue_type_name[AF_CJK_BLUE_TYPE_MAX] = { "filled",
+ "unfilled" };
+#endif
+
/* We compute the blues simply by loading each character from the */
/* `blue_chars[blues]' string, then computing its extreme points */
@@ -306,7 +313,8 @@
fill_type == AF_CJK_BLUE_TYPE_FILL );
- FT_TRACE5(( "cjk blue %3d/%d: ", bb, fill_type ));
+ FT_TRACE5(( "cjk blue %s/%s\n", cjk_blue_name[bb],
+ cjk_blue_type_name[fill_type] ));
for ( ; p < limit && *p; p++ )
@@ -317,16 +325,22 @@
FT_Vector* points;
- FT_TRACE5(( "0x%lX", *p ));
+ FT_TRACE5(( " U+%lX...", *p ));
/* load the character in the face -- skip unknown or empty ones */
glyph_index = FT_Get_Char_Index( face, *p );
if ( glyph_index == 0 )
+ {
+ FT_TRACE5(( "unavailable\n" ));
continue;
+ }
error = FT_Load_Glyph( face, glyph_index, FT_LOAD_NO_SCALE );
if ( error || glyph->outline.n_points <= 0 )
+ {
+ FT_TRACE5(( "no outline\n" ));
continue;
+ }
/* now compute min or max point indices and coordinates */
points = glyph->outline.points;
@@ -406,7 +420,7 @@
best_last = last;
}
}
- FT_TRACE5(( "%5ld, ", best_pos ));
+ FT_TRACE5(( "best_pos=%5ld\n", best_pos ));
}
if ( fill )
@@ -414,8 +428,6 @@
else
flats[num_flats++] = best_pos;
}
-
- FT_TRACE5(( "\n" ));
}
if ( num_flats == 0 && num_fills == 0 )
@@ -479,8 +491,8 @@
else if ( AF_CJK_BLUE_RIGHT == bb )
blue->flags |= AF_CJK_BLUE_IS_RIGHT;
- FT_TRACE5(( "-- cjk ref = %ld shoot = %ld\n",
- *blue_ref, *blue_shoot ));
+ FT_TRACE5(( "-- cjk %s bluezone ref = %ld shoot = %ld\n",
+ cjk_blue_name[bb], *blue_ref, *blue_shoot ));
}
return;