minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

* src/base/ftcalc.c: Remove miscellaneous type casts.

This commit is contained in:
Alexei Podtelezhnikov 2014-10-01 23:27:15 -04:00
parent 418e18f3df
commit 74d0aad22c
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2014-10-01 Alexei Podtelezhnikov <apodtele@gmail.com>
* src/base/ftcalc.c: Remove miscellaneous type casts.
2014-10-01 Alexei Podtelezhnikov <apodtele@gmail.com>
[base] Use more common `FT_MSB' implementation with masks.

22
src/base/ftcalc.c
View File

@ -382,7 +382,7 @@
/* covers the practical range of use. The actual test below is a bit */
/* tighter to avoid the border case overflows. */
/* */
/* In the case of FT_DivFix, the direct overflow check */
/* In the case of FT_DivFix, the exact overflow check */
/* */
/* a << 16 <= X - c/2 */
/* */
@ -419,15 +419,16 @@
FT_Int64 temp, temp2;
ft_multo64( (FT_Int32)a, (FT_Int32)b, &temp );
ft_multo64( a, b, &temp );
temp2.hi = 0;
temp2.lo = (FT_UInt32)(c >> 1);
temp2.lo = c >> 1;
FT_Add64( &temp, &temp2, &temp );
/* last attempt to ditch long division */
a = temp.hi == 0 ? temp.lo / c
: ft_div64by32( temp.hi, temp.lo, (FT_Int32)c );
: ft_div64by32( temp.hi, temp.lo, c );
}
return ( s < 0 ? -a : a );
@ -460,11 +461,11 @@
FT_Int64 temp;
ft_multo64( (FT_Int32)a, (FT_Int32)b, &temp );
ft_multo64( a, b, &temp );
/* last attempt to ditch long division */
a = temp.hi == 0 ? temp.lo / c
: ft_div64by32( temp.hi, temp.lo, (FT_Int32)c );
: ft_div64by32( temp.hi, temp.lo, c );
}
return ( s < 0 ? -a : a );
@ -603,12 +604,13 @@
FT_Int64 temp, temp2;
temp.hi = (FT_Int32)( a >> 16 );
temp.lo = (FT_UInt32)a << 16;
temp.hi = a >> 16;
temp.lo = a << 16;
temp2.hi = 0;
temp2.lo = (FT_UInt32)( b >> 1 );
temp2.lo = b >> 1;
FT_Add64( &temp, &temp2, &temp );
q = (FT_Long)ft_div64by32( temp.hi, temp.lo, (FT_Int32)b );
q = (FT_Long)ft_div64by32( temp.hi, temp.lo, b );
}
return ( s < 0 ? -q : q );