Commit 200a1a41e34675577a786997d1c8e757d5b5a841
2000-11-13T07:31:21
In function TT_Load_Generic_Header, change tracing output to indicate if a `bhed' or `head' table is being read. In function TT_LookUp_Table, change tracing output to indicate success or failure of table loading, and place output on one line.
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
diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c
index 66d2f26..7ed11f4 100644
--- a/src/sfnt/ttload.c
+++ b/src/sfnt/ttload.c
@@ -69,12 +69,12 @@
TT_Table* limit;
- FT_TRACE3(( "TT_LookUp_Table: %08p, `%c%c%c%c'\n",
- face,
- (FT_Char)( tag >> 24 ),
- (FT_Char)( tag >> 16 ),
- (FT_Char)( tag >> 8 ),
- (FT_Char)( tag ) ));
+ FT_TRACE3(( "TT_LookUp_Table: %08p, `%c%c%c%c' -- ",
+ face,
+ (FT_Char)( tag >> 24 ),
+ (FT_Char)( tag >> 16 ),
+ (FT_Char)( tag >> 8 ),
+ (FT_Char)( tag ) ));
entry = face->dir_tables;
limit = entry + face->num_tables;
@@ -82,10 +82,13 @@
for ( ; entry < limit; entry++ )
{
if ( entry->Tag == tag )
+ {
+ FT_TRACE3(( "found table.\n" ));
return entry;
+ }
}
- FT_TRACE3(( " Could not find table!\n" ));
+ FT_TRACE3(( "could not find table!\n" ));
return 0;
}
@@ -446,10 +449,10 @@
/*************************************************************************/
/* */
/* <Function> */
- /* TT_Load_Header */
+ /* TT_Load_Generic_Header */
/* */
/* <Description> */
- /* Loads the TrueType font header. */
+ /* Loads the TrueType table `head' or `bhed'. */
/* */
/* <Input> */
/* face :: A handle to the target face object. */
@@ -495,12 +498,17 @@
};
- FT_TRACE2(( "Load_TT_Header: %08p\n", face ));
+ FT_TRACE2(( "TT_Load_Generic_Header: %08p, looking up font table `%c%c%c%c'.\n",
+ face,
+ (FT_Char)( tag >> 24 ),
+ (FT_Char)( tag >> 16 ),
+ (FT_Char)( tag >> 8 ),
+ (FT_Char)( tag ) ));
error = face->goto_table( face, tag, stream, 0 );
if ( error )
{
- FT_TRACE0(( "Font Header is missing!\n" ));
+ FT_TRACE2(( "TT_Load_Generic_Table: Font table is missing!\n" ));
goto Exit;
}
@@ -511,7 +519,7 @@
FT_TRACE2(( " Units per EM: %8u\n", header->Units_Per_EM ));
FT_TRACE2(( " IndexToLoc: %8d\n", header->Index_To_Loc_Format ));
- FT_TRACE2(( "Font Header Loaded.\n" ));
+ FT_TRACE2(( "TT_Load_Generic_Table: Font table loaded.\n" ));
Exit:
return error;