diff options
author | Werner Lemberg <wl@gnu.org> | 2013-03-14 11:21:17 +0100 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2013-03-14 11:21:17 +0100 |
commit | e3c9301581a450fae5db73a3b94b10ed6a0aeb5e (patch) | |
tree | dc078dba342716dbc7508c54277376d25b23c931 /src/cid | |
parent | 059bc335ce42220b222763379e89d0cbf2b949eb (diff) | |
download | freetype2-e3c9301581a450fae5db73a3b94b10ed6a0aeb5e.tar.gz |
*/*: Use FT_Err_Ok only.
This is a purely mechanical conversion.
Diffstat (limited to 'src/cid')
-rw-r--r-- | src/cid/cidgload.c | 4 | ||||
-rw-r--r-- | src/cid/cidload.c | 10 | ||||
-rw-r--r-- | src/cid/cidobjs.c | 6 | ||||
-rw-r--r-- | src/cid/cidriver.c | 12 |
4 files changed, 16 insertions, 16 deletions
diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c index 55f538379..a1a865869 100644 --- a/src/cid/cidgload.c +++ b/src/cid/cidgload.c @@ -46,7 +46,7 @@ FT_Byte* p; FT_UInt fd_select; FT_Stream stream = face->cid_stream; - FT_Error error = CID_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Byte* charstring = 0; FT_Memory memory = face->root.memory; FT_ULong glyph_length = 0; @@ -258,7 +258,7 @@ psaux->t1_decoder_funcs->done( &decoder ); - return CID_Err_Ok; + return FT_Err_Ok; } diff --git a/src/cid/cidload.c b/src/cid/cidload.c index 66b4e49f2..8ced3166a 100644 --- a/src/cid/cidload.c +++ b/src/cid/cidload.c @@ -195,7 +195,7 @@ offset->y = temp[5] >> 16; } - return CID_Err_Ok; /* this is a callback function; */ + return FT_Err_Ok; /* this is a callback function; */ /* we must return an error code */ } @@ -206,7 +206,7 @@ { CID_FaceInfo cid = &face->cid; FT_Memory memory = face->root.memory; - FT_Error error = CID_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Long num_dicts; @@ -257,7 +257,7 @@ dict->private_dict.expansion_factor = dict->expansion_factor; } - return CID_Err_Ok; + return FT_Err_Ok; } @@ -286,7 +286,7 @@ parser->root.cursor = base; parser->root.limit = base + size; - parser->root.error = CID_Err_Ok; + parser->root.error = FT_Err_Ok; { FT_Byte* cur = base; @@ -624,7 +624,7 @@ p++; } - error = CID_Err_Ok; + error = FT_Err_Ok; Exit: return error; diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c index 4b07e9f75..46555e2dc 100644 --- a/src/cid/cidobjs.c +++ b/src/cid/cidobjs.c @@ -131,7 +131,7 @@ cid_size_init( FT_Size cidsize ) /* CID_Size */ { CID_Size size = (CID_Size)cidsize; - FT_Error error = CID_Err_Ok; + FT_Error error = FT_Err_Ok; PSH_Globals_Funcs funcs = cid_size_get_globals_funcs( size ); @@ -169,7 +169,7 @@ size->metrics.y_scale, 0, 0 ); - return CID_Err_Ok; + return FT_Err_Ok; } @@ -466,7 +466,7 @@ { FT_UNUSED( driver ); - return CID_Err_Ok; + return FT_Err_Ok; } diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c index 694070aab..501d1a16a 100644 --- a/src/cid/cidriver.c +++ b/src/cid/cidriver.c @@ -4,7 +4,7 @@ /* */ /* CID driver interface (body). */ /* */ -/* Copyright 1996-2004, 2006, 2008, 2009, 2011 by */ +/* Copyright 1996-2004, 2006, 2008, 2009, 2011, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -74,7 +74,7 @@ { *afont_info = ((CID_Face)face)->cid.font_info; - return CID_Err_Ok; + return FT_Err_Ok; } static FT_Error @@ -83,7 +83,7 @@ { *afont_extra = ((CID_Face)face)->font_extra; - return CID_Err_Ok; + return FT_Err_Ok; } static const FT_Service_PsInfoRec cid_service_ps_info = @@ -118,7 +118,7 @@ if ( supplement ) *supplement = cid->supplement; - return CID_Err_Ok; + return FT_Err_Ok; } @@ -126,7 +126,7 @@ cid_get_is_cid( CID_Face face, FT_Bool *is_cid ) { - FT_Error error = CID_Err_Ok; + FT_Error error = FT_Err_Ok; FT_UNUSED( face ); @@ -142,7 +142,7 @@ FT_UInt glyph_index, FT_UInt *cid ) { - FT_Error error = CID_Err_Ok; + FT_Error error = FT_Err_Ok; FT_UNUSED( face ); |