diff options
| author | Werner Lemberg <wl@gnu.org> | 2013-03-14 17:50:49 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2013-03-14 17:50:49 +0100 |
| commit | 89f5064765bdedd1f3449d3f8d7b96bfe86aa23d (patch) | |
| tree | 724ac6feb3fa78f23f524d7c71cf5f91c97f7be1 /src/winfonts | |
| parent | 52339dc2742dfd2a1e91aeb1067506e4a7311d35 (diff) | |
| download | freetype2-89f5064765bdedd1f3449d3f8d7b96bfe86aa23d.tar.gz | |
*/*: Use FT_ERR_EQ, FT_ERR_NEQ, and FT_ERR where appropriate.
FT_Err_XXX and friends are no longer directly used in the source
code.
Diffstat (limited to 'src/winfonts')
| -rw-r--r-- | src/winfonts/winfnt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c index f30dad8e9..233ea09dc 100644 --- a/src/winfonts/winfnt.c +++ b/src/winfonts/winfnt.c @@ -284,7 +284,7 @@ FT_STREAM_READ_FIELDS( winmz_header_fields, &mz_header ) ) goto Exit; - error = FNT_Err_Unknown_File_Format; + error = FT_ERR( Unknown_File_Format ); if ( mz_header.magic == WINFNT_MZ_MAGIC ) { /* yes, now look for an NE header in the file */ @@ -297,7 +297,7 @@ FT_STREAM_READ_FIELDS( winne_header_fields, &ne_header ) ) goto Exit; - error = FNT_Err_Unknown_File_Format; + error = FT_ERR( Unknown_File_Format ); if ( ne_header.magic == WINFNT_NE_MAGIC ) { /* good, now look into the resource table for each FNT resource */ @@ -705,7 +705,7 @@ if ( !error && face_index < 0 ) goto Exit; - if ( error == FNT_Err_Unknown_File_Format ) + if ( FT_ERR_EQ( error, Unknown_File_Format ) ) { /* this didn't work; try to load a single FNT font */ FNT_Font font; @@ -920,7 +920,7 @@ FNT_Face face = (FNT_Face)size->face; FT_WinFNT_Header header = &face->font->header; FT_Bitmap_Size* bsize = size->face->available_sizes; - FT_Error error = FNT_Err_Invalid_Pixel_Size; + FT_Error error = FT_ERR( Invalid_Pixel_Size ); FT_Long height; |