forked from minhngoc25a/freetype2
[stroker] Minor clean-up.
* src/base/ftstroke.c (FT_Stroker_{ConicTo,CubicTo}): Reset the last line length. (FT_Stroker_EndSubPath): Call `ft_stroker_process_corner'.
This commit is contained in:
parent
601c5a611e
commit
4c3bd2ab93
|
@ -1,3 +1,11 @@
|
||||||
|
2021-01-27 Alexei Podtelezhnikov <apodtele@gmail.com>
|
||||||
|
|
||||||
|
[stroker] Minor clean-up.
|
||||||
|
|
||||||
|
* src/base/ftstroke.c (FT_Stroker_{ConicTo,CubicTo}): Reset the last
|
||||||
|
line length.
|
||||||
|
(FT_Stroker_EndSubPath): Call `ft_stroker_process_corner'.
|
||||||
|
|
||||||
2021-01-27 Vincent Torri <vincent.torri@gmail.com>
|
2021-01-27 Vincent Torri <vincent.torri@gmail.com>
|
||||||
|
|
||||||
* builds/windows/ftsystem.c: Add shared memory support on Windows.
|
* builds/windows/ftsystem.c: Add shared memory support on Windows.
|
||||||
|
|
|
@ -1528,7 +1528,8 @@
|
||||||
stroker->angle_in = angle_out;
|
stroker->angle_in = angle_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
stroker->center = *to;
|
stroker->center = *to;
|
||||||
|
stroker->line_length = 0;
|
||||||
|
|
||||||
Exit:
|
Exit:
|
||||||
return error;
|
return error;
|
||||||
|
@ -1744,7 +1745,8 @@
|
||||||
stroker->angle_in = angle_out;
|
stroker->angle_in = angle_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
stroker->center = *to;
|
stroker->center = *to;
|
||||||
|
stroker->line_length = 0;
|
||||||
|
|
||||||
Exit:
|
Exit:
|
||||||
return error;
|
return error;
|
||||||
|
@ -1897,10 +1899,6 @@
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
FT_Angle turn;
|
|
||||||
FT_Int inside_side;
|
|
||||||
|
|
||||||
|
|
||||||
/* close the path if needed */
|
/* close the path if needed */
|
||||||
if ( stroker->center.x != stroker->subpath_start.x ||
|
if ( stroker->center.x != stroker->subpath_start.x ||
|
||||||
stroker->center.y != stroker->subpath_start.y )
|
stroker->center.y != stroker->subpath_start.y )
|
||||||
|
@ -1912,29 +1910,11 @@
|
||||||
|
|
||||||
/* process the corner */
|
/* process the corner */
|
||||||
stroker->angle_out = stroker->subpath_angle;
|
stroker->angle_out = stroker->subpath_angle;
|
||||||
turn = FT_Angle_Diff( stroker->angle_in,
|
|
||||||
stroker->angle_out );
|
|
||||||
|
|
||||||
/* no specific corner processing is required if the turn is 0 */
|
error = ft_stroker_process_corner( stroker,
|
||||||
if ( turn != 0 )
|
stroker->subpath_line_length );
|
||||||
{
|
if ( error )
|
||||||
/* when we turn to the right, the inside side is 0 */
|
goto Exit;
|
||||||
/* otherwise, the inside side is 1 */
|
|
||||||
inside_side = ( turn < 0 );
|
|
||||||
|
|
||||||
error = ft_stroker_inside( stroker,
|
|
||||||
inside_side,
|
|
||||||
stroker->subpath_line_length );
|
|
||||||
if ( error )
|
|
||||||
goto Exit;
|
|
||||||
|
|
||||||
/* process the outside side */
|
|
||||||
error = ft_stroker_outside( stroker,
|
|
||||||
!inside_side,
|
|
||||||
stroker->subpath_line_length );
|
|
||||||
if ( error )
|
|
||||||
goto Exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* then end our two subpaths */
|
/* then end our two subpaths */
|
||||||
ft_stroke_border_close( stroker->borders + 0, FALSE );
|
ft_stroke_border_close( stroker->borders + 0, FALSE );
|
||||||
|
|
Loading…
Reference in New Issue