Commit 34e52707f06cf6deb59a1db94842b070749088e1
2000-11-13T16:58:01
Formatting; removing tabs.
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 94 95
diff --git a/ChangeLog b/ChangeLog
index 1726cc2..33b2746 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,10 @@
2000-11-12 Tom Kacvinsky <tjk@ams.org>
- * src/sfnt/ttload.c: Change tracing output in functions
- TT_LookUp_Table and TT_Load_Generic_Table. Change comments
- preceding TT_Load_Generic_Table.
- * src/sfnt/sfobjs.c: In function SFNT_Load_Face, set boolean
- variable has-outline to true only if the font has a `glyf' or
- `CFF ' table.
+ * src/sfnt/ttload.c (TT_LookUp_Table, TT_Load_Generic_Table): Change
+ tracing output.
+
+ * src/sfnt/sfobjs.c (SFNT_Load_Face): Set boolean variable
+ `has-outline' to true only if the font has a `glyf' or `CFF ' table.
2000-11-11 Werner Lemberg <wl@gnu.org>
@@ -27,8 +26,8 @@
* builds/unix/unix-def.in: Add
- INSTALL_PROGRAM := @INSTALL_PROGRAM@
- INSTALL_SCRIPT := @INSTALL_SCRIPT@
+ INSTALL_PROGRAM := @INSTALL_PROGRAM@
+ INSTALL_SCRIPT := @INSTALL_SCRIPT@
so that installation of freetype-config does not fail.
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index 3cf31a0..f3e0f68 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -287,7 +287,7 @@
/* do we have outlines in there? */
has_outline = ( ( TT_LookUp_Table( face, TTAG_glyf ) != 0 ) ||
- ( TT_LookUp_Table( face, TTAG_CFF ) != 0 ) );
+ ( TT_LookUp_Table( face, TTAG_CFF ) != 0 ) );
is_apple_sbit = 0;
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c
index 7ed11f4..686629a 100644
--- a/src/sfnt/ttload.c
+++ b/src/sfnt/ttload.c
@@ -70,11 +70,11 @@
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 ) ));
+ 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;
@@ -83,7 +83,7 @@
{
if ( entry->Tag == tag )
{
- FT_TRACE3(( "found table.\n" ));
+ FT_TRACE3(( "found table.\n" ));
return entry;
}
}
@@ -498,12 +498,13 @@
};
- 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 ) ));
+ 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 )