diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-22 14:14:24 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-22 14:14:24 +0000 |
| commit | 4284aeba874b9168f2228c59639bec8346a56796 (patch) | |
| tree | d51ffb4507e0cae24b0875d8bb6b2c037829a684 /freetype/src/autofit/afhints.c | |
| parent | c438f190eedc71ee8dd14e14fec660e98d3dc0bf (diff) | |
| parent | 0695dfb71ca6fe132d15a4d0890e8a868183adf9 (diff) | |
| download | vcxsrv-4284aeba874b9168f2228c59639bec8346a56796.tar.gz vcxsrv-4284aeba874b9168f2228c59639bec8346a56796.tar.bz2 vcxsrv-4284aeba874b9168f2228c59639bec8346a56796.zip | |
svn merge ^/branches/released
Diffstat (limited to 'freetype/src/autofit/afhints.c')
| -rw-r--r-- | freetype/src/autofit/afhints.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/freetype/src/autofit/afhints.c b/freetype/src/autofit/afhints.c index 6384cb79a..3ec4730b9 100644 --- a/freetype/src/autofit/afhints.c +++ b/freetype/src/autofit/afhints.c @@ -34,7 +34,7 @@ { FT_Int old_max = axis->max_segments; FT_Int new_max = old_max; - FT_Int big_max = FT_INT_MAX / sizeof ( *segment ); + FT_Int big_max = (FT_Int)( FT_INT_MAX / sizeof ( *segment ) ); if ( old_max >= big_max ) @@ -77,7 +77,7 @@ { FT_Int old_max = axis->max_edges; FT_Int new_max = old_max; - FT_Int big_max = FT_INT_MAX / sizeof ( *edge ); + FT_Int big_max = (FT_Int)( FT_INT_MAX / sizeof ( *edge ) ); if ( old_max >= big_max ) @@ -645,6 +645,7 @@ FT_Int contour_index = 0; + FT_UNUSED( first ); for ( point = points; point < point_limit; point++, vec++, tag++ ) { point->fx = (FT_Short)vec->x; @@ -940,8 +941,8 @@ } { - FT_UInt min, max, mid; - FT_Pos fpos; + FT_PtrDist min, max, mid; + FT_Pos fpos; /* find enclosing edges */ @@ -952,7 +953,7 @@ /* for small edge counts, a linear search is better */ if ( max <= 8 ) { - FT_UInt nn; + FT_PtrDist nn; for ( nn = 0; nn < max; nn++ ) if ( edges[nn].fpos >= u ) |