diff options
| author | Werner Lemberg <wl@gnu.org> | 2002-04-28 10:25:55 +0000 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2002-04-28 10:25:55 +0000 |
| commit | b658ac9e63daf21cb136c10444eb29033cde7882 (patch) | |
| tree | 36aa58af16be07a5267d3025e53ae40bb416f264 /src/pfr/pfrload.c | |
| parent | 7b3dc7bb61a786b08e6ac2e12b4a5fa3a312c055 (diff) | |
| download | freetype2-b658ac9e63daf21cb136c10444eb29033cde7882.tar.gz | |
* src/pfr/pfrerror.h: New file.
* include/freetype/ftmoderr.h: Add PFR error codes.
* src/pfr/pfrgload.c: Include pfrerror.h.
Use PCF error codes.
(pfr_extra_item_load_stem_snaps): Fix debug message.
* src/pfr/pfrgload.c: Include pfrerror.h.
Use PCF error codes.
(pfr_extra_item_load_bitmap_info, pfr_glyph_load_simple,
pfr_glyph_load_compound): Fix debug message.
* src/pfr/pfrobjs.c: Include pfrerror.h.
Use PCF error codes.
(pfr_face_init): Return PFR_Err_Unknown_File_Format.
* src/pfr/rules.mk (PFR_DRV_H): Include pfrerror.h.
Diffstat (limited to 'src/pfr/pfrload.c')
| -rw-r--r-- | src/pfr/pfrload.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/pfr/pfrload.c b/src/pfr/pfrload.c index 410bbfaeb..c4d1503c4 100644 --- a/src/pfr/pfrload.c +++ b/src/pfr/pfrload.c @@ -20,6 +20,8 @@ #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_STREAM_H +#include "pfrerror.h" + #undef FT_COMPONENT #define FT_COMPONENT trace_pfr @@ -89,7 +91,7 @@ Too_Short: FT_ERROR(( "pfr_extra_items_parse: invalid extra items table\n" )); - error = FT_Err_Invalid_Table; + error = PFR_Err_Invalid_Table; goto Exit; } @@ -234,7 +236,7 @@ goto Exit; if ( index >= num_log_fonts ) - return FT_Err_Invalid_Argument; + return PFR_Err_Invalid_Argument; if ( FT_STREAM_SKIP( index * 5 ) || FT_READ_USHORT( size ) || @@ -327,7 +329,7 @@ Too_Short: FT_ERROR(( "pfr_log_font_load: invalid logical font table\n" )); - error = FT_Err_Invalid_Table; + error = PFR_Err_Invalid_Table; goto Fail; } @@ -424,8 +426,8 @@ return error; Too_Short: - error = FT_Err_Invalid_Table; - FT_ERROR(( "pfr.extra_item_load: invalid bitmap info table\n" )); + error = PFR_Err_Invalid_Table; + FT_ERROR(( "pfr_extra_item_load_bitmap_info: invalid bitmap info table\n" )); goto Exit; } @@ -493,8 +495,8 @@ return error; Too_Short: - error = FT_Err_Invalid_Table; - FT_ERROR(( "pfr.exta_item_load: invalid stem snaps table\n" )); + error = PFR_Err_Invalid_Table; + FT_ERROR(( "pfr_exta_item_load_stem_snaps: invalid stem snaps table\n" )); goto Exit; } @@ -678,7 +680,7 @@ return error; Too_Short: - error = FT_Err_Invalid_Table; + error = PFR_Err_Invalid_Table; FT_ERROR(( "pfr_phy_font_load: invalid physical font table\n" )); goto Fail; } |