Commit 91ea0bf80d1561d0e571523fd078f41d91f823b6
2010-06-26T22:46:38
Improve PFR tracing messages. * src/pfr/pfrgload.c (pfr_glyph_load_rec): Emit tracing messages for simple and compound glyph offsets.
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
diff --git a/ChangeLog b/ChangeLog
index 2d6403d..5988dcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2010-06-26 Werner Lemberg <wl@gnu.org>
+ Improve PFR tracing messages.
+
+ * src/pfr/pfrgload.c (pfr_glyph_load_rec): Emit tracing messages for
+ simple and compound glyph offsets.
+
+2010-06-26 Werner Lemberg <wl@gnu.org>
+
Fix last PFR change.
* src/pfr/pfrobjs.c (pfr_face_init): Fix rejection logic.
diff --git a/src/pfr/pfrgload.c b/src/pfr/pfrgload.c
index 387bde2..2dd6a91 100644
--- a/src/pfr/pfrgload.c
+++ b/src/pfr/pfrgload.c
@@ -753,6 +753,9 @@
count = glyph->num_subs - old_count;
+ FT_TRACE4(( "compound glyph with %d elements (offset %lu):\n",
+ count, offset ));
+
/* now, load each individual glyph */
for ( n = 0; n < count; n++ )
{
@@ -760,6 +763,8 @@
PFR_SubGlyph subglyph;
+ FT_TRACE4(( "subglyph %d:\n", n ));
+
subglyph = glyph->subs + old_count + n;
old_points = base->n_points;
@@ -767,7 +772,7 @@
subglyph->gps_offset,
subglyph->gps_size );
if ( error )
- goto Exit;
+ break;
/* note that `glyph->subs' might have been re-allocated */
subglyph = glyph->subs + old_count + n;
@@ -801,9 +806,13 @@
/* proceed to next sub-glyph */
}
+
+ FT_TRACE4(( "end compound glyph with %d elements\n", count ));
}
else
{
+ FT_TRACE4(( "simple glyph (offset %lu)\n", offset ));
+
/* load a simple glyph */
error = pfr_glyph_load_simple( glyph, p, limit );
@@ -815,9 +824,6 @@
}
-
-
-
FT_LOCAL_DEF( FT_Error )
pfr_glyph_load( PFR_Glyph glyph,
FT_Stream stream,