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/base/fttrigon.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/base/fttrigon.c')
| -rw-r--r-- | src/base/fttrigon.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/base/fttrigon.c b/src/base/fttrigon.c index 9f51394..fdf433a 100644 --- a/src/base/fttrigon.c +++ b/src/base/fttrigon.c @@ -72,10 +72,10 @@ val = ( val >= 0 ) ? val : -val; v1 = (FT_UInt32)val >> 16; - v2 = (FT_UInt32)val & 0xFFFFL; + v2 = (FT_UInt32)(val & 0xFFFFL); - k1 = FT_TRIG_SCALE >> 16; /* constant */ - k2 = FT_TRIG_SCALE & 0xFFFFL; /* constant */ + k1 = (FT_UInt32)FT_TRIG_SCALE >> 16; /* constant */ + k2 = (FT_UInt32)(FT_TRIG_SCALE & 0xFFFFL); /* constant */ hi = k1 * v1; lo1 = k1 * v2 + k2 * v1; /* can't overflow */ @@ -86,7 +86,7 @@ hi += lo1 >> 16; if ( lo1 < lo3 ) - hi += 0x10000UL; + hi += (FT_UInt32)0x10000UL; val = (FT_Fixed)hi; @@ -433,7 +433,7 @@ if ( shift > 0 ) { - FT_Int32 half = 1L << ( shift - 1 ); + FT_Int32 half = (FT_Int32)1L << ( shift - 1 ); vec->x = ( v.x + half + FT_SIGN_LONG( v.x ) ) >> shift; |