diff options
author | marha <marha@users.sourceforge.net> | 2012-03-12 10:33:22 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-03-12 10:33:22 +0100 |
commit | 41bd254198b8b879a562a85f7dc868c3c0f7fbc1 (patch) | |
tree | 3db49b4d73b8c4c734c1382ab5469a4f9f8baf93 /freetype/src/base/ftadvanc.c | |
parent | b91444584a64f4f7b3eaeee05ef36ac53691fb24 (diff) | |
download | vcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.tar.gz vcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.tar.bz2 vcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.zip |
Updated to freetype-2.4.9
Diffstat (limited to 'freetype/src/base/ftadvanc.c')
-rw-r--r-- | freetype/src/base/ftadvanc.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/freetype/src/base/ftadvanc.c b/freetype/src/base/ftadvanc.c index 8ab7fcb92..a8bb43d3d 100644 --- a/freetype/src/base/ftadvanc.c +++ b/freetype/src/base/ftadvanc.c @@ -4,7 +4,7 @@ /* */ /* Quick computation of advance widths (body). */ /* */ -/* Copyright 2008, 2009 by */ +/* Copyright 2008, 2009, 2011 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -129,7 +129,7 @@ { error = func( face, start, count, flags, padvances ); if ( !error ) - goto Exit; + return _ft_face_scale_advances( face, padvances, count, flags ); if ( error != FT_ERROR_BASE( FT_Err_Unimplemented_Feature ) ) return error; @@ -147,16 +147,13 @@ if ( error ) break; + /* scale from 26.6 to 16.16 */ padvances[nn] = ( flags & FT_LOAD_VERTICAL_LAYOUT ) - ? face->glyph->advance.y - : face->glyph->advance.x; + ? face->glyph->advance.y << 10 + : face->glyph->advance.x << 10; } - if ( error ) - return error; - - Exit: - return _ft_face_scale_advances( face, padvances, count, flags ); + return error; } |