diff options
| author | Chris Liddell <chris.liddell@artifex.com> | 2016-11-08 09:50:00 +0000 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2016-11-22 09:49:30 +0000 |
| commit | 6655712ee1d0bf2a7818044613bbed226b7abddd (patch) | |
| tree | 14ed7439e7962421bcb26e7f72cac77c679cd0a5 /freetype/src/gxvalid/gxvmort1.c | |
| parent | 99c6a18eb430a9091c79369b2bdd2952d481c7d5 (diff) | |
| download | ghostpdl-6655712ee1d0bf2a7818044613bbed226b7abddd.tar.gz | |
Update freetype to 2.7.0
Tweak makefile for new freetype version
Force use of the v35 Freetype bytecode interpreter
Diffstat (limited to 'freetype/src/gxvalid/gxvmort1.c')
| -rw-r--r-- | freetype/src/gxvalid/gxvmort1.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/freetype/src/gxvalid/gxvmort1.c b/freetype/src/gxvalid/gxvmort1.c index 0189504ed..fd761d069 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-2016 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 ); @@ -191,7 +192,7 @@ GXV_NAME_ENTER( "validating contents of substitutionTable" ); - for ( i = 0; i < num_gids ; i ++ ) + for ( i = 0; i < num_gids; i++ ) { FT_UShort dst_gid; |