diff options
author | marha <marha@users.sourceforge.net> | 2010-08-06 10:14:25 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-08-06 10:14:25 +0000 |
commit | 47ed6413ce8f2586b8d542dc46055e075a47022e (patch) | |
tree | b814efb2655c444a4f63ac3cbb7d0cdf4bb3ef2f /freetype/src/sfnt/ttkern.c | |
parent | c115795736eb99a8f2288a06c231b9386f4d011f (diff) | |
download | vcxsrv-47ed6413ce8f2586b8d542dc46055e075a47022e.tar.gz vcxsrv-47ed6413ce8f2586b8d542dc46055e075a47022e.tar.bz2 vcxsrv-47ed6413ce8f2586b8d542dc46055e075a47022e.zip |
Updated to freetype 2.4.1
Diffstat (limited to 'freetype/src/sfnt/ttkern.c')
-rw-r--r-- | freetype/src/sfnt/ttkern.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/freetype/src/sfnt/ttkern.c b/freetype/src/sfnt/ttkern.c index c1540802b..46888988e 100644 --- a/freetype/src/sfnt/ttkern.c +++ b/freetype/src/sfnt/ttkern.c @@ -5,7 +5,7 @@ /* Load the basic TrueType kerning table. This doesn't handle */ /* kerning data within the GPOS table at the moment. */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -115,7 +115,7 @@ num_pairs = FT_NEXT_USHORT( p ); p += 6; - if ( ( p_next - p ) / 6 < (int)num_pairs ) /* handle broken count */ + if ( ( p_next - p ) < 6 * (int)num_pairs ) /* handle broken count */ num_pairs = (FT_UInt)( ( p_next - p ) / 6 ); avail |= mask; @@ -220,7 +220,7 @@ num_pairs = FT_NEXT_USHORT( p ); p += 6; - if ( ( next - p ) / 6 < (int)num_pairs ) /* handle broken count */ + if ( ( next - p ) < 6 * (int)num_pairs ) /* handle broken count */ num_pairs = (FT_UInt)( ( next - p ) / 6 ); switch ( coverage >> 8 ) |