ref: 60a1fab094a1aa3a3d58763114d54dd712770e4f
parent: 5a902ec20f3b0817c87f6761c830f29711e4df33
author: Werner Lemberg <[email protected]>
date: Fri Feb 8 01:23:50 EST 2002
some cleaning
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,38 +1,55 @@
2002-02-07 David Turner <[email protected]>
- * src/pcf/pcfread.c (pcf_load_font): removed immature support of
- the AVERAGE_WIDTH property..
+ * src/pcf/pcfread.c (pcf_load_font): Removed immature support of
+ the AVERAGE_WIDTH property.
-2002-02-06 David Turner <[email protected]>
+2002-02-06 David Turner <[email protected]>
- * 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/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/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)
-
- reformatting / renaming a few functions for the sake of consistency
+ * 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 <[email protected]>
-2002-02-06 Detlef W�rkner
-
- * src/pcf/pcfdriver.c (FT_Done_Face): fixed small memory leak
+ * 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 <[email protected]>
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@@ -207,7 +207,7 @@
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 @@
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 @@
/* 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 );
--- 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 );