Commit 6870f4cf1ad4c264d16f4073c50e86c37b5fccc8

Werner Lemberg 2001-08-18T05:09:42

* src/base/ftcalc.c (FT_MulDiv): Fixed serious typo.

diff --git a/ChangeLog b/ChangeLog
index 0b49557..81dd097 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 54469ba..247ee03 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;