ref: 2ca5b07d4f27a1f1c3be9438c49b41a15a84ff7b
parent: fa437d8d3c38210bf4f2034058912748364462ef
author: Alexei Podtelezhnikov <[email protected]>
date: Tue Jan 31 18:13:50 EST 2017
* src/smooth/ftgrays.c (gray_render_scanline): Improve code.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-01-31 Alexei Podtelezhnikov <[email protected]>
+
+ * src/smooth/ftgrays.c (gray_render_scanline): Improve code.
+
2017-01-31 Werner Lemberg <[email protected]>
[cff] Provide metrics variation service interface (#50196).
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -600,7 +600,7 @@
TPos x2,
TCoord y2 )
{- TCoord ex1, ex2, fx1, fx2, first, delta, mod;
+ TCoord ex1, ex2, fx1, fx2, first, dy, delta, mod;
TPos p, dx;
int incr;
@@ -617,31 +617,27 @@
fx1 = (TCoord)( x1 - SUBPIXELS( ex1 ) );
fx2 = (TCoord)( x2 - SUBPIXELS( ex2 ) );
- delta = y2 - y1;
/* everything is located in a single cell. That is easy! */
/* */
if ( ex1 == ex2 )
- {- ras.area += (TArea)(( fx1 + fx2 ) * delta);
- ras.cover += delta;
- return;
- }
+ goto End;
/* ok, we'll have to render a run of adjacent cells on the same */
/* scanline... */
/* */
dx = x2 - x1;
+ dy = y2 - y1;
if ( dx > 0 )
{- p = ( ONE_PIXEL - fx1 ) * delta;
+ p = ( ONE_PIXEL - fx1 ) * dy;
first = ONE_PIXEL;
incr = 1;
}
else
{- p = fx1 * delta;
+ p = fx1 * dy;
first = 0;
incr = -1;
dx = -dx;
@@ -649,12 +645,11 @@
FT_DIV_MOD( TCoord, p, dx, delta, mod );
- ras.area += (TArea)(( fx1 + first ) * delta);
+ ras.area += (TArea)( ( fx1 + first ) * delta );
ras.cover += delta;
-
- ex1 += incr;
+ y1 += delta;
+ ex1 += incr;
gray_set_cell( RAS_VAR_ ex1, ey );
- y1 += delta;
if ( ex1 != ex2 )
{@@ -661,22 +656,20 @@
TCoord lift, rem;
- p = ONE_PIXEL * ( y2 - y1 + delta );
+ p = ONE_PIXEL * dy;
FT_DIV_MOD( TCoord, p, dx, lift, rem );
- mod -= (int)dx;
-
do
{delta = lift;
mod += rem;
- if ( mod >= 0 )
+ if ( mod >= (TCoord)dx )
{mod -= (TCoord)dx;
delta++;
}
- ras.area += (TArea)(ONE_PIXEL * delta);
+ ras.area += (TArea)( ONE_PIXEL * delta );
ras.cover += delta;
y1 += delta;
ex1 += incr;
@@ -684,9 +677,13 @@
} while ( ex1 != ex2 );
}
- delta = y2 - y1;
- ras.area += (TArea)(( fx2 + ONE_PIXEL - first ) * delta);
- ras.cover += delta;
+ fx1 = ONE_PIXEL - first;
+
+ End:
+ dy = y2 - y1;
+
+ ras.area += (TArea)( ( fx1 + fx2 ) * dy );
+ ras.cover += dy;
}
@@ -798,13 +795,12 @@
p = ONE_PIXEL * dx;
FT_DIV_MOD( TCoord, p, dy, lift, rem );
- mod -= (TCoord)dy;
do
{delta = lift;
mod += rem;
- if ( mod >= 0 )
+ if ( mod >= (TCoord)dy )
{mod -= (TCoord)dy;
delta++;