diff options
| author | David 'Digit' Turner <digit@google.com> | 2010-03-03 14:24:57 -0800 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2010-03-03 15:33:53 -0800 |
| commit | 295ffce55e0198e7a9f7d46b33f5c2b4147bf821 (patch) | |
| tree | bda1a337e630483e46b2e4d4db803814437b765d /src/autofit/afhints.c | |
| parent | 6fb02c1f75ab969890012dd1f01939d3444ddbc1 (diff) | |
| download | android_external_freetype-295ffce55e0198e7a9f7d46b33f5c2b4147bf821.tar.gz android_external_freetype-295ffce55e0198e7a9f7d46b33f5c2b4147bf821.tar.bz2 android_external_freetype-295ffce55e0198e7a9f7d46b33f5c2b4147bf821.zip | |
Update to FreeType 2.3.12
Diffstat (limited to 'src/autofit/afhints.c')
| -rw-r--r-- | src/autofit/afhints.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/autofit/afhints.c b/src/autofit/afhints.c index 8ab1761..a5aec80 100644 --- a/src/autofit/afhints.c +++ b/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,7 +941,7 @@ } { - FT_UInt min, max, mid; + FT_PtrDist min, max, mid; FT_Pos fpos; @@ -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 ) |