Commit 60a1fab094a1aa3a3d58763114d54dd712770e4f
2002-02-08T06:23:50
some cleaning
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 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148
diff --git a/ChangeLog b/ChangeLog
index bb5c707..704be4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,38 +1,55 @@
2002-02-07 David Turner <david@freetype.org>
- * src/pcf/pcfread.c (pcf_load_font): removed immature support of
- the AVERAGE_WIDTH property..
-
-2002-02-06 David Turner <david@freetype.org>
-
- * src/sfnt/sfobjs.c (SFNT_Load_Face): since many fonts embedded in
- PDF documents do not include 'cmap', 'post' and 'name' tables, the
- SFNT face loader has been changed to not immediately report an
- error if these are not present.
-
- Note that the specification _requires_ these tables, but Adobe
- seems to ignore it completely..
-
-
- * src/sfnt/ttcmap.c: removing compiler warnings
-
- * src/pcf/pcfread.c, src/pcf/pcf.h, src/pcf/pcfdriver.c:
- removing minor bugs (delaying format checks out of
- FT_Access_Frame .. FT_Forget_Frame blocks to avoid leaving the
- stream in an incorrect state when encountering an invalid PCF
- font)
+ * src/pcf/pcfread.c (pcf_load_font): Removed immature support of
+ the AVERAGE_WIDTH property.
+
+2002-02-06 David Turner <david@freetype.org>
+
+ * src/sfnt/sfobjs.c (SFNT_Load_Face): Since many fonts embedded in
+ PDF documents do not include 'cmap', 'post' and 'name' tables, the
+ SFNT face loader has been changed to not immediately report an
+ error if these are not present.
+
+ Note that the specification _requires_ these tables, but Adobe
+ seems to ignore it completely.
+
+ * src/sfnt/ttcmap.c: Removing compiler warnings.
+
+ * src/pcf/pcfread.c (pcf_read_TOC): Use FT_UInt.
+ (pcf_parse_metric, pcf_parse_compressed_metric): Removed. Code
+ is now in ...
+ (pcf_get_metric): Here.
+ (pcfSeekToType): Renamed to ...
+ (pcf_seek_to_table_type): This.
+ Use FT_Int.
+ (pcfHasType): Renamed to ...
+ (pcf_has_table_type): This.
+ Use FT_Int.
+ (find_property): Renamed to ...
+ (pcf_find_property): This.
+ Use FT_Int.
+ (pcf_get_bitmaps, pcf_get_encodings): Handle invalid PCF fonts
+ better (delaying format checks out of FT_Access_Frame ..
+ FT_Forget_Frame blocks to avoid leaving the stream in an incorrect
+ state when encountering an invalid PCF font).
+ * src/pcf/pcfdriver.c (PCF_Done_Face): Renamed to ...
+ (PCF_Face_Done): This.
+ (PCF_Init_Face): Renamed to ...
+ (PCF_Face_Init): This.
+ (PCF_Get_Char_Index): Renamed to ...
+ (PCF_Char_Get_Index): This.
+ (PCF_Get_Next_Char): Renamed to ...
+ (PCF_Char_Get_Next): This.
+ (pcf_driver_class): Updated.
+ * src/pcf/pcf.h (PCF_Done_Face): Removed.
+
+2002-02-06 Detlef Würkner <TetiSoft@apg.lahn.de>
+
+ * src/pcf/pcfdriver.c (FT_Done_Face): Fixed small memory leak.
- reformatting / renaming a few functions for the sake of consistency
-
-
-2002-02-06 Detlef Würkner
-
- * src/pcf/pcfdriver.c (FT_Done_Face): fixed small memory leak
-
- * src/pcf/pcfread.c (pcf_load_font): now handles the "AVERAGE_WIDTH"
- property to return correct character pixel (width/height) pairs for
- embedded bitmaps..
-
+ * src/pcf/pcfread.c (pcf_load_font): Now handles the "AVERAGE_WIDTH"
+ property to return correct character pixel (width/height) pairs for
+ embedded bitmaps.
2002-02-04 Keith Packard <keithp@keithp.com>
diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
index b33a259..407613c 100644
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@@ -207,7 +207,7 @@ THE SOFTWARE.
FT_ULong format,
PCF_Metric metric )
{
- FT_Error error = PCF_Err_Ok;
+ FT_Error error = PCF_Err_Ok;
if ( PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) )
@@ -481,11 +481,11 @@ THE SOFTWARE.
error = pcf_seek_to_table_type( stream,
- face->toc.tables,
- face->toc.count,
- PCF_METRICS,
- &format,
- &size );
+ face->toc.tables,
+ face->toc.count,
+ PCF_METRICS,
+ &format,
+ &size );
if ( error )
return error;
@@ -870,8 +870,8 @@ THE SOFTWARE.
/* Use the old accelerators if no BDF accelerators are in the file. */
hasBDFAccelerators = pcf_has_table_type( face->toc.tables,
- face->toc.count,
- PCF_BDF_ACCELERATORS );
+ face->toc.count,
+ PCF_BDF_ACCELERATORS );
if ( !hasBDFAccelerators )
{
error = pcf_get_accel( stream, face, PCF_ACCELERATORS );
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index fddc3c8..119fc35 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -296,8 +296,8 @@
if ( !is_apple_sbit && LOAD_( header ) )
goto Exit;
- /* the following tables are often not present in embedded TrueType fonts */
- /* within PDF documents, so don't check for them.. */
+ /* the following tables are often not present in embedded TrueType */
+ /* fonts within PDF documents, so don't check for them. */
(void)LOAD_( max_profile );
(void)LOAD_( charmaps );