diff options
Diffstat (limited to 'freetype/src/gxvalid')
| -rw-r--r-- | freetype/src/gxvalid/gxvcommn.c | 8 | ||||
| -rw-r--r-- | freetype/src/gxvalid/gxvcommn.h | 5 | ||||
| -rw-r--r-- | freetype/src/gxvalid/gxverror.h | 4 | ||||
| -rw-r--r-- | freetype/src/gxvalid/gxvfeat.c | 4 |
4 files changed, 12 insertions, 9 deletions
diff --git a/freetype/src/gxvalid/gxvcommn.c b/freetype/src/gxvalid/gxvcommn.c index d3c48d4ea..72efd6ff5 100644 --- a/freetype/src/gxvalid/gxvcommn.c +++ b/freetype/src/gxvalid/gxvcommn.c @@ -1334,7 +1334,7 @@ l[1] = stateArray_length_p; l[2] = entryTable_length_p; - gxv_set_length_by_ulong_offset( o, l, buff, 4, table_size, valid ); + gxv_set_length_by_ulong_offset( o, l, buff, 3, table_size, valid ); } @@ -1704,9 +1704,9 @@ const FT_String* name, GXV_odtect_Range odtect ) { - odtect->range[ odtect->nRanges ].start = start; - odtect->range[ odtect->nRanges ].length = length; - odtect->range[ odtect->nRanges ].name = (FT_String*)name; + odtect->range[odtect->nRanges].start = start; + odtect->range[odtect->nRanges].length = length; + odtect->range[odtect->nRanges].name = (FT_String*)name; odtect->nRanges++; } diff --git a/freetype/src/gxvalid/gxvcommn.h b/freetype/src/gxvalid/gxvcommn.h index 35c043dbd..1ff87e442 100644 --- a/freetype/src/gxvalid/gxvcommn.h +++ b/freetype/src/gxvalid/gxvcommn.h @@ -4,7 +4,8 @@ /* */ /* TrueTypeGX/AAT common tables validation (specification). */ /* */ -/* Copyright 2004, 2005 by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ +/* Copyright 2004, 2005, 2012 */ +/* by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -316,7 +317,7 @@ FT_BEGIN_HEADER #define GXV_32BIT_ALIGNMENT_VALIDATE( a ) \ FT_BEGIN_STMNT \ { \ - if ( 0 != ( (a) % 4 ) ) \ + if ( (a) & 3 ) \ FT_INVALID_OFFSET ; \ } \ FT_END_STMNT diff --git a/freetype/src/gxvalid/gxverror.h b/freetype/src/gxvalid/gxverror.h index 019619922..7d2ef7809 100644 --- a/freetype/src/gxvalid/gxverror.h +++ b/freetype/src/gxvalid/gxverror.h @@ -4,7 +4,8 @@ /* */ /* TrueTypeGX/AAT validation module error codes (specification only). */ /* */ -/* Copyright 2004, 2005 by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ +/* Copyright 2004, 2005, 2012 */ +/* by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -38,6 +39,7 @@ #undef __FTERRORS_H__ +#undef FT_ERR_PREFIX #define FT_ERR_PREFIX GXV_Err_ #define FT_ERR_BASE FT_Mod_Err_GXV diff --git a/freetype/src/gxvalid/gxvfeat.c b/freetype/src/gxvalid/gxvfeat.c index 46792bbf9..6f7565099 100644 --- a/freetype/src/gxvalid/gxvfeat.c +++ b/freetype/src/gxvalid/gxvfeat.c @@ -4,7 +4,7 @@ /* */ /* TrueTypeGX/AAT feat table validation (body). */ /* */ -/* Copyright 2004, 2005, 2008 by */ +/* Copyright 2004, 2005, 2008, 2012 by */ /* suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ @@ -176,7 +176,7 @@ setting = FT_NEXT_USHORT( p ); /* If we have exclusive setting, the setting should be odd. */ - if ( exclusive && ( setting % 2 ) == 0 ) + if ( exclusive && ( setting & 1 ) == 0 ) FT_INVALID_DATA; gxv_feat_name_index_validate( p, limit, valid ); |