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

[base] Small optimization of the ancient code. 

* src/base/ftcalc.c (FT_MulDiv, FT_MulDiv_No_Round): Loosen up the
condition for direct 32-bit calculations.
This commit is contained in:
Alexei Podtelezhnikov 2014-07-04 23:01:32 -04:00
parent 3897556a13
commit ceab95a649
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2014-07-04 Alexei Podtelezhnikov <apodtele@gmail.com>
[base] Small optimization of the ancient code.
* src/base/ftcalc.c (FT_MulDiv, FT_MulDiv_No_Round): Loosen up the
condition for direct 32-bit calculations.
2014-06-27 Werner Lemberg <wl@gnu.org>
Fix Apple standard glyph names.

16
src/base/ftcalc.c
View File

@ -363,15 +363,17 @@
/* */
/* we compute 'a*b+c/2', then divide it by 'c'. (positive values) */
/* */
/* 46340 is FLOOR(SQRT(2^31-1)). */
/* A sufficient condition to avoid overflow is as follows. */
/* */
/* if ( a <= 46340 && b <= 46340 ) then ( a*b <= 0x7FFEA810 ) */
/* a + b <= 2 * sqrt( X - c/2 ) */
/* */
/* 0x7FFFFFFF - 0x7FFEA810 = 0x157F0 */
/* where X = 2^31 - 1. After Taylor expansion, we make it stronger */
/* */
/* if ( c < 0x157F0*2 ) then ( a*b+c/2 <= 0x7FFFFFFF ) */
/* a + b <= 92681.9 - c / 92681.9 */
/* */
/* and 2*0x157F0 = 176096 */
/* with explicit 2*sqrt(X) = 92681.9. What we actually use is this */
/* */
/* a + b <= 92681 - (c >> 16) */
/* */
FT_EXPORT_DEF( FT_Long )
@ -390,7 +392,7 @@
s ^= b; b = FT_ABS( b );
s ^= c; c = FT_ABS( c );
if ( a <= 46340L && b <= 46340L && c <= 176095L && c > 0 )
if ( (FT_ULong)a + (FT_ULong)b <= 92681UL - ( c >> 16 ) && c > 0 )
a = ( a * b + ( c >> 1 ) ) / c;
else if ( (FT_Int32)c > 0 )
@ -427,7 +429,7 @@
s ^= b; b = FT_ABS( b );
s ^= c; c = FT_ABS( c );
if ( a <= 46340L && b <= 46340L && c > 0 )
if ( (FT_ULong)a + (FT_ULong)b <= 92681UL && c > 0 )
a = a * b / c;
else if ( (FT_Int32)c > 0 )