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/gxvkern.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/gxvkern.c')
| -rw-r--r-- | freetype/src/gxvalid/gxvkern.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/freetype/src/gxvalid/gxvkern.c b/freetype/src/gxvalid/gxvkern.c index 787e3db83..f257c0376 100644 --- a/freetype/src/gxvalid/gxvkern.c +++ b/freetype/src/gxvalid/gxvkern.c @@ -4,8 +4,8 @@ /* */ /* TrueTypeGX/AAT kern table validation (body). */ /* */ -/* Copyright 2004-2007, 2013 */ -/* by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */ +/* Copyright 2004-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, */ @@ -549,7 +549,7 @@ } } - gxvalid->subtable_length = p - table; + gxvalid->subtable_length = (FT_ULong)( p - table ); GXV_EXIT; } @@ -779,7 +779,7 @@ #ifdef GXV_LOAD_TRACE_VARS version = 0; #endif - length = ( u16[0] << 16 ) + u16[1]; + length = ( (FT_ULong)u16[0] << 16 ) + u16[1]; #ifdef GXV_LOAD_TRACE_VARS tupleIndex = 0; #endif |