diff options
| author | marha <marha@users.sourceforge.net> | 2015-06-15 20:22:43 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-06-15 20:22:43 +0200 |
| commit | 0b3be550b20ad9f991f77bf979b2c306a7d4ef11 (patch) | |
| tree | 523f6db090457118723eca33dabc7758eeb2dcde /freetype/src/gxvalid/gxvmort1.c | |
| parent | 5fe210ff514aa4b3149ea7561862776d7b8849e7 (diff) | |
| download | vcxsrv-0b3be550b20ad9f991f77bf979b2c306a7d4ef11.tar.gz vcxsrv-0b3be550b20ad9f991f77bf979b2c306a7d4ef11.tar.bz2 vcxsrv-0b3be550b20ad9f991f77bf979b2c306a7d4ef11.zip | |
Update to freetype 2.6
Diffstat (limited to 'freetype/src/gxvalid/gxvmort1.c')
| -rw-r--r-- | freetype/src/gxvalid/gxvmort1.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/freetype/src/gxvalid/gxvmort1.c b/freetype/src/gxvalid/gxvmort1.c index 0189504ed..aa02df5a9 100644 --- a/freetype/src/gxvalid/gxvmort1.c +++ b/freetype/src/gxvalid/gxvmort1.c @@ -5,7 +5,8 @@ /* TrueTypeGX/AAT mort table validation */ /* body for type1 (Contextual Substitution) subtable. */ /* */ -/* Copyright 2005, 2007 by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ +/* Copyright 2005-2015 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, */ @@ -155,7 +156,7 @@ setMark = (FT_UShort)( flags >> 15 ); dontAdvance = (FT_UShort)( ( flags >> 14 ) & 1 ); #endif - reserved = (FT_Short)( flags & 0x3FFF ); + reserved = (FT_UShort)( flags & 0x3FFF ); markOffset = (FT_Short)( glyphOffset_p->ul >> 16 ); currentOffset = (FT_Short)( glyphOffset_p->ul ); |