diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-18 08:30:47 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-18 08:30:47 +0200 |
| commit | d8e3f99cdf46297afeb26fe15ad30f7c6de8ee7c (patch) | |
| tree | 199776414c3aa9aab0a35c1d16d38c7a072d6665 /freetype/src/gxvalid/gxvmorx1.c | |
| parent | 7723537ddbe5dd4070f2bebbd4e0c93be3244b18 (diff) | |
| download | vcxsrv-d8e3f99cdf46297afeb26fe15ad30f7c6de8ee7c.tar.gz vcxsrv-d8e3f99cdf46297afeb26fe15ad30f7c6de8ee7c.tar.bz2 vcxsrv-d8e3f99cdf46297afeb26fe15ad30f7c6de8ee7c.zip | |
Switched to freetype 2.4.5
Diffstat (limited to 'freetype/src/gxvalid/gxvmorx1.c')
| -rw-r--r-- | freetype/src/gxvalid/gxvmorx1.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/freetype/src/gxvalid/gxvmorx1.c b/freetype/src/gxvalid/gxvmorx1.c index e1c162fa0..ce0009a16 100644 --- a/freetype/src/gxvalid/gxvmorx1.c +++ b/freetype/src/gxvalid/gxvmorx1.c @@ -108,8 +108,10 @@ FT_Bytes limit, GXV_Validator valid ) { +#ifdef GXV_LOAD_TRACE_VARS FT_UShort setMark; FT_UShort dontAdvance; +#endif FT_UShort reserved; FT_Short markIndex; FT_Short currentIndex; @@ -122,8 +124,10 @@ FT_UNUSED( limit ); +#ifdef GXV_LOAD_TRACE_VARS setMark = (FT_UShort)( ( flags >> 15 ) & 1 ); dontAdvance = (FT_UShort)( ( flags >> 14 ) & 1 ); +#endif reserved = (FT_UShort)( flags & 0x3FFF ); @@ -136,8 +140,7 @@ if ( 0 < reserved ) { GXV_TRACE(( " non-zero bits found in reserved range\n" )); - if ( valid->root->level >= FT_VALIDATE_PARANOID ) - FT_INVALID_DATA; + GXV_SET_ERR_IF_PARANOID( FT_INVALID_DATA ); } GXV_TRACE(( "markIndex = %d, currentIndex = %d\n", |