Commit 1b3a0014e2ebad50efb6a0c1d7948a3c7ffc21a2
2001-06-11T13:26:11
* src/base/ftcalc.c (FT_MulDiv, FT_DivFix, FT_Sqrt64): Remove compiler warnings.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
diff --git a/ChangeLog b/ChangeLog
index e9bc2b2..b1cb853 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 899c9c8..c4a60b1 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 */