diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-15 14:04:46 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-15 14:04:46 +0200 |
| commit | a33de30073bfa0ee1abba186dba9fa52cf0aa23a (patch) | |
| tree | 9eae122e901b9a1d1c7cfcfc2385202793a1f92a /freetype/src/truetype/ttgload.c | |
| parent | 7a2af605c2c2b0d2e9bbb0b161eba8842acefbcb (diff) | |
| download | vcxsrv-a33de30073bfa0ee1abba186dba9fa52cf0aa23a.tar.gz vcxsrv-a33de30073bfa0ee1abba186dba9fa52cf0aa23a.tar.bz2 vcxsrv-a33de30073bfa0ee1abba186dba9fa52cf0aa23a.zip | |
Updated to following packages:
freetype-2.4.10
libXaw-1.0.11
openssl-1.0.1c
Diffstat (limited to 'freetype/src/truetype/ttgload.c')
| -rw-r--r-- | freetype/src/truetype/ttgload.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/freetype/src/truetype/ttgload.c b/freetype/src/truetype/ttgload.c index ce8c8887b..22cbc09e2 100644 --- a/freetype/src/truetype/ttgload.c +++ b/freetype/src/truetype/ttgload.c @@ -1983,13 +1983,11 @@ FT_UInt glyph_index, FT_Int32 load_flags ) { - TT_Face face; FT_Error error; TT_LoaderRec loader; - face = (TT_Face)glyph->face; - error = TT_Err_Ok; + error = TT_Err_Ok; #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS @@ -2003,10 +2001,7 @@ error = load_sbit_image( size, glyph, glyph_index, load_flags ); if ( !error ) { - FT_Face root = &face->root; - - - if ( FT_IS_SCALABLE( root ) ) + if ( FT_IS_SCALABLE( glyph->face ) ) { /* for the bbox we need the header only */ (void)tt_loader_init( &loader, size, glyph, load_flags, TRUE ); |