diff options
| author | Werner Lemberg <wl@gnu.org> | 2001-04-02 23:54:01 +0000 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2001-04-02 23:54:01 +0000 |
| commit | 005b8b998abdc7d1ee6b7f585ca2a66ee1ec0088 (patch) | |
| tree | 827ce4ac42b79bdddf066988beee1c184cfc47f7 /src/sfnt | |
| parent | 9e77d32f21d14a725dda93d671714dfd3f33c952 (diff) | |
| download | freetype2-005b8b998abdc7d1ee6b7f585ca2a66ee1ec0088.tar.gz | |
* README: Formatting.
* Jamfile: Fix typo.
* src/cff/cffparse.c: Move error code #defines to...
* include/freetype/internal/cfferrs.h: This file.
* src/cff/cffdrivr.c, src/cff/cffobjs.c, src/cff/cffload.c: Replaced
`FT_Err_*' with `CFF_Err_*'.
* src/cid/cidparse.c: Replaced `FT_Err_*' with `T1_Err_*'.
* src/psaux/psobjs.c, src/psaux/t1decode.c: Ditto.
* src/sfnt/sfobcs.c, src/sfnt/ttload.c: Replaced `FT_Err_*' with
`TT_Err_*'.
* src/truetype/ttgload.c, src/truetype/ttobjs.c: Ditto.
* src/type1/t1gload.c, src/type1/t1load.c, src/type1/t1objs.c,
src/type1/t1parse.c: Replaced `FT_Err_*' with `T1_Err_*'.
* include/freetype/internal/cfferrs.h: Add
`CFF_Err_Unknown_File_Format'.
* include/freetype/internal/t1errors.h: Add
`T1_Err_Unknown_File_Format'.
* include/freetype/internal/tterrors.h: Add
`TT_Err_Unknown_File_Format'.
* src/cff/cffload.h: Add `cff_*_encoding' and `cff_*_charset'
references.
* src/psaux/psobjs.c: Include `FT_INTERNAL_TYPE1_ERRORS_H'.
* src/cff/cffobjs.c (CFF_Init_Face, CFF_Done_Face): Use
FT_LOCAL_DEF.
* src/cid/cidobjs.c (CID_Done_Driver): Ditto.
* src/trutype/ttobjs.c (TT_Init_Face, TT_Done_Face, TT_Init_Size):
Ditto.
* src/type1/t1objs.c (T1_Done_Driver): Ditto.
* src/pcf/pcfdriver.c (PCF_Done_Face): Ditto.
* src/pcf/pcf.h: Use FT_LOCAL for `PCF_Done_Face'.
Diffstat (limited to 'src/sfnt')
| -rw-r--r-- | src/sfnt/sfobjs.c | 4 | ||||
| -rw-r--r-- | src/sfnt/ttload.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c index 30f199103..31b94e6c9 100644 --- a/src/sfnt/sfobjs.c +++ b/src/sfnt/sfobjs.c @@ -199,7 +199,7 @@ sfnt = (SFNT_Interface*)FT_Get_Module_Interface( library, "sfnt" ); if ( !sfnt ) { - error = FT_Err_Invalid_File_Format; + error = TT_Err_Invalid_File_Format; goto Exit; } @@ -328,7 +328,7 @@ { /* return an error if this font file has no outlines */ if ( error == TT_Err_Table_Missing && has_outline ) - error = FT_Err_Ok; + error = TT_Err_Ok; else goto Exit; } diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c index baf35be13..9ef433c90 100644 --- a/src/sfnt/ttload.c +++ b/src/sfnt/ttload.c @@ -262,7 +262,7 @@ entry_selector * 2 <= num_tables ) { FT_TRACE2(( "TT_Load_SFNT_Header: file is not SFNT!\n" )); - error = FT_Err_Unknown_File_Format; + error = TT_Err_Unknown_File_Format; } } |