diff options
| author | Werner Lemberg <wl@gnu.org> | 2001-06-11 13:26:11 +0000 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2001-06-11 13:26:11 +0000 |
| commit | 2bd945c3756036cf11ffb9667f13eb338ece1568 (patch) | |
| tree | 34607787ad74ef972fddd06f12414e17db6663ad | |
| parent | 645f60b8695177376d60f9dacd681914ad34cf93 (diff) | |
| download | freetype2-2bd945c3756036cf11ffb9667f13eb338ece1568.tar.gz | |
* src/base/ftcalc.c (FT_MulDiv, FT_DivFix, FT_Sqrt64): Remove
compiler warnings.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/base/ftcalc.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2001-06-11 Mike Owens <MOwens@amtdatasouth.com> + + * src/base/ftcalc.c (FT_MulDiv, FT_DivFix, FT_Sqrt64): Remove + compiler warnings. + 2001-06-08 Werner Lemberg <wl@gnu.org> * builds/unix/configure.in: Renamed to ... diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c index 899c9c8f5..c4a60b139 100644 --- a/src/base/ftcalc.c +++ b/src/base/ftcalc.c @@ -147,7 +147,7 @@ if ( b < 0 ) { b = -b; s = -s; } if ( c < 0 ) { c = -c; s = -s; } - d = ( c > 0 ? ( (FT_Int64)a * b + ( c >> 1 ) ) / c + d = (FT_Long)( c > 0 ? ( (FT_Int64)a * b + ( c >> 1 ) ) / c : 0x7FFFFFFFL ); return ( s > 0 ) ? d : -d; @@ -188,7 +188,7 @@ q = 0x7FFFFFFFL; else /* compute result directly */ - q = ( ((FT_Int64)a << 16) + (b >> 1)) / b; + q = (FT_UInt32)( ( ( (FT_Int64)a << 16 ) + ( b >> 1 ) ) / b ); return ( s < 0 ? -(FT_Long)q : (FT_Long)q ); } @@ -232,7 +232,7 @@ } while ( r > s || r * r > l ); - return r; + return (FT_Int32)r; } #endif /* FT_CONFIG_OPTION_OLD_CALCS */ |