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: Harmonize code.

This commit is contained in:
Alexei Podtelezhnikov 2014-09-19 22:03:15 -04:00
parent ef070d458b
commit 5c894842d3
2 changed files with 27 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,4 +1,8 @@
2014-09-08 Alexei Podtelezhnikov <apodtele@gmail.com> 2014-09-19 Alexei Podtelezhnikov <apodtele@gmail.com>
* src/base/ftcalc.c: Harmonize code.
2014-09-15 Alexei Podtelezhnikov <apodtele@gmail.com>
[base] Tighten the overflow check in `FT_MulDiv'. [base] Tighten the overflow check in `FT_MulDiv'.

67
src/base/ftcalc.c
View File

@ -166,11 +166,10 @@
FT_Long b, FT_Long b,
FT_Long c ) FT_Long c )
{ {
FT_Int s; FT_Int s = 1;
FT_Long d; FT_Long d;
s = 1;
if ( a < 0 ) { a = -a; s = -1; } if ( a < 0 ) { a = -a; s = -1; }
if ( b < 0 ) { b = -b; s = -s; } if ( b < 0 ) { b = -b; s = -s; }
if ( c < 0 ) { c = -c; s = -s; } if ( c < 0 ) { c = -c; s = -s; }
@ -189,11 +188,10 @@
FT_Long b, FT_Long b,
FT_Long c ) FT_Long c )
{ {
FT_Int s; FT_Int s = 1;
FT_Long d; FT_Long d;
s = 1;
if ( a < 0 ) { a = -a; s = -1; } if ( a < 0 ) { a = -a; s = -1; }
if ( b < 0 ) { b = -b; s = -s; } if ( b < 0 ) { b = -b; s = -s; }
if ( c < 0 ) { c = -c; s = -s; } if ( c < 0 ) { c = -c; s = -s; }
@ -221,17 +219,8 @@
FT_Long c; FT_Long c;
if ( a < 0 ) if ( a < 0 ) { a = -a; s = -1; }
{ if ( b < 0 ) { b = -b; s = -s; }
a = -a;
s = -1;
}
if ( b < 0 )
{
b = -b;
s = -s;
}
c = (FT_Long)( ( (FT_Int64)a * b + 0x8000L ) >> 16 ); c = (FT_Long)( ( (FT_Int64)a * b + 0x8000L ) >> 16 );
@ -251,23 +240,11 @@
FT_Long q; FT_Long q;
if ( a < 0 ) if ( a < 0 ) { a = -a; s = -1; }
{ if ( b < 0 ) { b = -b; s = -s; }
a = -a;
s = -1;
}
if ( b < 0 )
{
b = -b;
s = -s;
}
if ( b == 0 ) q = (FT_Long)( b > 0 ? ( ( (FT_UInt64)a << 16 ) + ( b >> 1 ) ) / b
/* check for division by 0 */ : 0x7FFFFFFFL );
q = 0x7FFFFFFFL;
else
/* compute result directly */
q = (FT_Long)( ( ( (FT_UInt64)a << 16 ) + ( b >> 1 ) ) / b );
return ( s < 0 ? -q : q ); return ( s < 0 ? -q : q );
} }
@ -412,16 +389,16 @@
FT_Long b, FT_Long b,
FT_Long c ) FT_Long c )
{ {
long s; FT_Int s = 1;
/* XXX: this function does not allow 64-bit arguments */ /* XXX: this function does not allow 64-bit arguments */
if ( a == 0 || b == c ) if ( a == 0 || b == c )
return a; return a;
s = a; a = FT_ABS( a ); if ( a < 0 ) { a = -a; s = -1; }
s ^= b; b = FT_ABS( b ); if ( b < 0 ) { b = -b; s = -s; }
s ^= c; c = FT_ABS( c ); if ( c < 0 ) { c = -c; s = -s; }
if ( c == 0 ) if ( c == 0 )
a = 0x7FFFFFFFL; a = 0x7FFFFFFFL;
@ -451,15 +428,15 @@
FT_Long b, FT_Long b,
FT_Long c ) FT_Long c )
{ {
long s; FT_Int s = 1;
if ( a == 0 || b == c ) if ( a == 0 || b == c )
return a; return a;
s = a; a = FT_ABS( a ); if ( a < 0 ) { a = -a; s = -1; }
s ^= b; b = FT_ABS( b ); if ( b < 0 ) { b = -b; s = -s; }
s ^= c; c = FT_ABS( c ); if ( c < 0 ) { c = -c; s = -s; }
if ( c == 0 ) if ( c == 0 )
a = 0x7FFFFFFFL; a = 0x7FFFFFFFL;
@ -550,15 +527,15 @@
#else /* 0 */ #else /* 0 */
FT_Long s; FT_Int s = 1;
FT_ULong ua, ub; FT_ULong ua, ub;
if ( a == 0 || b == 0x10000L ) if ( a == 0 || b == 0x10000L )
return a; return a;
s = a; a = FT_ABS( a ); if ( a < 0 ) { a = -a; s = -1; }
s ^= b; b = FT_ABS( b ); if ( b < 0 ) { b = -b; s = -s; }
ua = (FT_ULong)a; ua = (FT_ULong)a;
ub = (FT_ULong)b; ub = (FT_ULong)b;
@ -587,13 +564,13 @@
FT_DivFix( FT_Long a, FT_DivFix( FT_Long a,
FT_Long b ) FT_Long b )
{ {
FT_Long s; FT_Int s = 1;
FT_Long q; FT_Long q;
/* XXX: this function does not allow 64-bit arguments */ /* XXX: this function does not allow 64-bit arguments */
s = a; a = FT_ABS( a ); if ( a < 0 ) { a = -a; s = -1; }
s ^= b; b = FT_ABS( b ); if ( b < 0 ) { b = -b; s = -s; }
if ( b == 0 ) if ( b == 0 )
{ {