diff options
Diffstat (limited to 'src/3rdparty/freetype/src/otvalid/otvmod.c')
-rw-r--r-- | src/3rdparty/freetype/src/otvalid/otvmod.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/3rdparty/freetype/src/otvalid/otvmod.c b/src/3rdparty/freetype/src/otvalid/otvmod.c index 3248564560..37c6e869dd 100644 --- a/src/3rdparty/freetype/src/otvalid/otvmod.c +++ b/src/3rdparty/freetype/src/otvalid/otvmod.c @@ -4,7 +4,7 @@ /* */ /* FreeType's OpenType validation module implementation (body). */ /* */ -/* Copyright 2004, 2005, 2006, 2007, 2008 by */ +/* Copyright 2004-2008, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -49,8 +49,8 @@ error = FT_Load_Sfnt_Table( face, tag, 0, NULL, table_len ); - if ( error == OTV_Err_Table_Missing ) - return OTV_Err_Ok; + if ( FT_ERR_EQ( error, Table_Missing ) ) + return FT_Err_Ok; if ( error ) goto Exit; @@ -73,7 +73,7 @@ FT_Bytes *ot_gsub, FT_Bytes *ot_jstf ) { - FT_Error error = OTV_Err_Ok; + FT_Error error = FT_Err_Ok; FT_Byte* volatile base; FT_Byte* volatile gdef; FT_Byte* volatile gpos; @@ -214,7 +214,8 @@ *ot_jstf = (FT_Bytes)jstf; Exit: - if ( error ) { + if ( error ) + { FT_Memory memory = FT_FACE_MEMORY( face ); @@ -224,6 +225,7 @@ FT_FREE( gsub ); FT_FREE( jstf ); } + { FT_Memory memory = FT_FACE_MEMORY( face ); @@ -264,7 +266,7 @@ const FT_Module_Class otv_module_class = { 0, - sizeof( FT_ModuleRec ), + sizeof ( FT_ModuleRec ), "otvalid", 0x10000L, 0x20000L, |