summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2001-08-18 05:09:42 +0000
committerWerner Lemberg <wl@gnu.org>2001-08-18 05:09:42 +0000
commitf2cc4a235e101aa6375acfab1b52e1d9cf8c6b1c (patch)
tree32656d30a4f64e687b6450ac3086f5bae53e242a
parent159d431faa842e2ab111ac283d9270dba01c8cda (diff)
downloadfreetype2-f2cc4a235e101aa6375acfab1b52e1d9cf8c6b1c.tar.gz
* src/base/ftcalc.c (FT_MulDiv): Fixed serious typo.
-rw-r--r--ChangeLog4
-rw-r--r--src/base/ftcalc.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b495573c..81dd0971d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-17 Martin Muskens <mmuskens@aurelon.com>
+
+ * src/base/ftcalc.c (FT_MulDiv): Fixed serious typo.
+
2001-08-12 Werner Lemberg <wl@gnu.org>
Updating to OpenType 1.3.
diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c
index 54469ba66..247ee034c 100644
--- a/src/base/ftcalc.c
+++ b/src/base/ftcalc.c
@@ -174,7 +174,7 @@
if ( c < 0 ) { c = -c; s = -s; }
d = (FT_Long)( c > 0 ? ( (FT_Int64)a * b + ( c >> 1 ) ) / c
- : 0x7FFFFFFFL );
+ : 0x7FFFFFFFL );
return ( s > 0 ) ? d : -d;
}
@@ -386,7 +386,7 @@
temp2.hi = 0;
temp2.lo = (FT_UInt32)(c >> 1);
FT_Add64( &temp, &temp2, &temp );
- a = ft_div64by32( temp.hi, temp.lo, b );
+ a = ft_div64by32( temp.hi, temp.lo, c );
}
else
a = 0x7FFFFFFFL;