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

* src/base/ftstroke.c (ft_stroker_cap): Speed up caps.

This commit is contained in:
Alexei Podtelezhnikov 2019-09-27 19:18:49 -04:00
parent 432efa25b3
commit b39576f984
3 changed files with 32 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2019-09-27 Alexei Podtelezhnikov <apodtele@gmail.com>
* src/base/ftstroke.c (ft_stroker_cap): Speed up caps.
2019-09-25 Alexei Podtelezhnikov <apodtele@gmail.com> 2019-09-25 Alexei Podtelezhnikov <apodtele@gmail.com>
* src/base/ftstroke.c (ft_stroker_outside): Speed up clipped miter. * src/base/ftstroke.c (ft_stroker_outside): Speed up clipped miter.

9
include/freetype/ftstroke.h
View File

@ -297,12 +297,13 @@ FT_BEGIN_HEADER
* expressed as 16.16 fixed point value. * expressed as 16.16 fixed point value.
* *
* @note: * @note:
* The radius is expressed in the same units as the outline coordinates. * The `radius` is expressed in the same units as the outline
* coordinates.
* *
* The miter limit multiplied by the radius gives the maximum size * The `miter_limit` multiplied by the `radius` gives the maximum size
* of a miter spike, at which it is clipped for * of a miter spike, at which it is clipped for
* `FT_STROKER_LINEJOIN_MITER_VARIABLE` or replaced with a bevel join for * @FT_STROKER_LINEJOIN_MITER_VARIABLE or replaced with a bevel join for
* `FT_STROKER_LINEJOIN_MITER_FIXED`. * @FT_STROKER_LINEJOIN_MITER_FIXED.
* *
* This function calls @FT_Stroker_Rewind automatically. * This function calls @FT_Stroker_Rewind automatically.
*/ */

61
src/base/ftstroke.c
View File

@ -923,55 +923,40 @@
error = ft_stroker_arcto( stroker, side ); error = ft_stroker_arcto( stroker, side );
} }
else if ( stroker->line_cap == FT_STROKER_LINECAP_SQUARE ) else
{ {
/* add a square cap */ /* add a square or butt cap */
FT_Vector delta, delta2; FT_Vector middle, delta;
FT_Angle rotate = FT_SIDE_TO_ROTATE( side );
FT_Fixed radius = stroker->radius; FT_Fixed radius = stroker->radius;
FT_StrokeBorder border = stroker->borders + side; FT_StrokeBorder border = stroker->borders + side;
FT_Vector_From_Polar( &delta2, radius, angle + rotate ); /* compute middle point and first angle point */
FT_Vector_From_Polar( &delta, radius, angle ); FT_Vector_From_Polar( &middle, radius, angle );
delta.x = side ? middle.y : -middle.y;
delta.y = side ? -middle.x : middle.x;
delta.x += stroker->center.x + delta2.x; if ( stroker->line_cap == FT_STROKER_LINECAP_SQUARE )
delta.y += stroker->center.y + delta2.y; {
middle.x += stroker->center.x;
middle.y += stroker->center.y;
}
else /* FT_STROKER_LINECAP_BUTT */
{
middle.x = stroker->center.x;
middle.y = stroker->center.y;
}
delta.x += middle.x;
delta.y += middle.y;
error = ft_stroke_border_lineto( border, &delta, FALSE ); error = ft_stroke_border_lineto( border, &delta, FALSE );
if ( error ) if ( error )
goto Exit; goto Exit;
FT_Vector_From_Polar( &delta2, radius, angle - rotate ); /* compute second angle point */
FT_Vector_From_Polar( &delta, radius, angle ); delta.x = middle.x - delta.x + middle.x;
delta.y = middle.y - delta.y + middle.y;
delta.x += delta2.x + stroker->center.x;
delta.y += delta2.y + stroker->center.y;
error = ft_stroke_border_lineto( border, &delta, FALSE );
}
else if ( stroker->line_cap == FT_STROKER_LINECAP_BUTT )
{
/* add a butt ending */
FT_Vector delta;
FT_Angle rotate = FT_SIDE_TO_ROTATE( side );
FT_Fixed radius = stroker->radius;
FT_StrokeBorder border = stroker->borders + side;
FT_Vector_From_Polar( &delta, radius, angle + rotate );
delta.x += stroker->center.x;
delta.y += stroker->center.y;
error = ft_stroke_border_lineto( border, &delta, FALSE );
if ( error )
goto Exit;
FT_Vector_From_Polar( &delta, radius, angle - rotate );
delta.x += stroker->center.x;
delta.y += stroker->center.y;
error = ft_stroke_border_lineto( border, &delta, FALSE ); error = ft_stroke_border_lineto( border, &delta, FALSE );
} }