rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More code formatting.

This commit is contained in:
Werner Lemberg 2016-12-17 21:05:54 +01:00
parent 5d664b6d51
commit 6949797d60
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builds/mac/ftmac.c
View File

@ -940,7 +940,7 @@ typedef short ResourceIndex;
{ {
err = lookup_lwfn_by_fond( pathname, lwfn_file_name, err = lookup_lwfn_by_fond( pathname, lwfn_file_name,
buff, sizeof ( buff ) ); buff, sizeof ( buff ) );
if ( FT_Err_Ok == err ) if ( !err )
have_lwfn = 1; have_lwfn = 1;
} }
@ -1217,7 +1217,7 @@ typedef short ResourceIndex;
} }
CloseResFile( res_ref ); CloseResFile( res_ref );
if ( FT_Err_Ok == error && NULL != aface ) if ( !error && aface )
(*aface)->num_faces = num_faces_in_res; (*aface)->num_faces = num_faces_in_res;
return error; return error;
} }
@ -1279,7 +1279,7 @@ typedef short ResourceIndex;
error = lookup_lwfn_by_fond( path_fond, lwfn_file_name, error = lookup_lwfn_by_fond( path_fond, lwfn_file_name,
path_lwfn, sizeof ( path_lwfn ) ); path_lwfn, sizeof ( path_lwfn ) );
if ( FT_Err_Ok == error ) if ( !error )
have_lwfn = 1; have_lwfn = 1;
} }
@ -1315,7 +1315,7 @@ typedef short ResourceIndex;
error = lookup_lwfn_by_fond( path_fond, lwfn_file_name, error = lookup_lwfn_by_fond( path_fond, lwfn_file_name,
path_lwfn, sizeof ( path_lwfn ) ); path_lwfn, sizeof ( path_lwfn ) );
if ( FT_Err_Ok == error ) if ( !error )
have_lwfn = 1; have_lwfn = 1;
} }
@ -1332,7 +1332,7 @@ typedef short ResourceIndex;
error = FT_ERR( Unknown_File_Format ); error = FT_ERR( Unknown_File_Format );
found_no_lwfn_file: found_no_lwfn_file:
if ( have_sfnt && FT_Err_Ok != error ) if ( have_sfnt && error )
error = FT_New_Face_From_SFNT( library, error = FT_New_Face_From_SFNT( library,
sfnt_id, sfnt_id,
face_index, face_index,
@ -1363,7 +1363,7 @@ typedef short ResourceIndex;
/* if it works, fine. */ /* if it works, fine. */
error = FT_New_Face_From_Suitcase( library, pathname, face_index, aface ); error = FT_New_Face_From_Suitcase( library, pathname, face_index, aface );
if ( error == 0 ) if ( !error )
return error; return error;
/* let it fall through to normal loader (.ttf, .otf, etc.); */ /* let it fall through to normal loader (.ttf, .otf, etc.); */
@ -1403,7 +1403,7 @@ typedef short ResourceIndex;
/* try resourcefork based font: LWFN, FFIL */ /* try resourcefork based font: LWFN, FFIL */
error = FT_New_Face_From_Resource( library, (UInt8 *)pathname, error = FT_New_Face_From_Resource( library, (UInt8 *)pathname,
face_index, aface ); face_index, aface );
if ( error != 0 || *aface != NULL ) if ( error || *aface )
return error; return error;
/* let it fall through to normal loader (.ttf, .otf, etc.) */ /* let it fall through to normal loader (.ttf, .otf, etc.) */
@ -1458,7 +1458,7 @@ typedef short ResourceIndex;
error = FT_ERR( Cannot_Open_Resource ); error = FT_ERR( Cannot_Open_Resource );
error = FT_New_Face_From_Resource( library, pathname, face_index, aface ); error = FT_New_Face_From_Resource( library, pathname, face_index, aface );
if ( error != 0 || *aface != NULL ) if ( error || *aface )
return error; return error;
/* fallback to datafork font */ /* fallback to datafork font */
@ -1515,7 +1515,7 @@ typedef short ResourceIndex;
error = FT_ERR( Cannot_Open_Resource ); error = FT_ERR( Cannot_Open_Resource );
error = FT_New_Face_From_Resource( library, pathname, face_index, aface ); error = FT_New_Face_From_Resource( library, pathname, face_index, aface );
if ( error != 0 || *aface != NULL ) if ( error || *aface )
return error; return error;
/* fallback to datafork font */ /* fallback to datafork font */

2
src/base/ftmac.c
View File

@ -1029,7 +1029,7 @@
error = FT_THROW( Cannot_Open_Resource ); error = FT_THROW( Cannot_Open_Resource );
error = FT_New_Face_From_Resource( library, pathname, face_index, aface ); error = FT_New_Face_From_Resource( library, pathname, face_index, aface );
if ( error != 0 || *aface != NULL ) if ( error || *aface )
return error; return error;
/* fallback to datafork font */ /* fallback to datafork font */

2
src/cff/cffparse.c
View File

@ -902,7 +902,7 @@
priv->vsindex, priv->vsindex,
subFont->lenNDV, subFont->lenNDV,
subFont->NDV ); subFont->NDV );
if ( error != FT_Err_Ok ) if ( error )
goto Exit; goto Exit;
} }

2
src/type1/t1load.c
View File

@ -2156,7 +2156,7 @@
parser->root.error = t1_load_keyword( face, parser->root.error = t1_load_keyword( face,
loader, loader,
keyword ); keyword );
if ( parser->root.error != FT_Err_Ok ) if ( parser->root.error )
{ {
if ( FT_ERR_EQ( parser->root.error, Ignore ) ) if ( FT_ERR_EQ( parser->root.error, Ignore ) )
parser->root.error = FT_Err_Ok; parser->root.error = FT_Err_Ok;