walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[cubic-glyf] Handle wrap-around cubic off-curves

This commit is contained in:
Behdad Esfahbod 2023-02-21 15:50:55 -07:00
parent 050f5a58fe
commit 22b9315628
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/OT/glyf/path-builder.hh
View File

@ -131,20 +131,30 @@ struct path_builder_t
{ {
if (first_offcurve && last_offcurve) if (first_offcurve && last_offcurve)
{ {
optional_point_t mid = last_offcurve.lerp (first_offcurve, .5f); optional_point_t mid = last_offcurve.lerp (first_offcurve2 ?
first_offcurve2 :
first_offcurve, .5f);
if (last_offcurve2)
draw_session->cubic_to (last_offcurve2.x, last_offcurve2.y,
last_offcurve.x, last_offcurve.y,
mid.x, mid.y);
else
draw_session->quadratic_to (last_offcurve.x, last_offcurve.y, draw_session->quadratic_to (last_offcurve.x, last_offcurve.y,
mid.x, mid.y); mid.x, mid.y);
last_offcurve = optional_point_t (); last_offcurve = optional_point_t ();
/* now check the rest */
} }
/* now check the rest */
if (first_offcurve2 && first_offcurve && first_oncurve) if (first_offcurve && first_oncurve)
{
if (first_offcurve2)
draw_session->cubic_to (first_offcurve2.x, first_offcurve2.y, draw_session->cubic_to (first_offcurve2.x, first_offcurve2.y,
first_offcurve.x, first_offcurve.y, first_offcurve.x, first_offcurve.y,
first_oncurve.x, first_oncurve.y); first_oncurve.x, first_oncurve.y);
if (first_offcurve && first_oncurve) else
draw_session->quadratic_to (first_offcurve.x, first_offcurve.y, draw_session->quadratic_to (first_offcurve.x, first_offcurve.y,
first_oncurve.x, first_oncurve.y); first_oncurve.x, first_oncurve.y);
}
else if (last_offcurve && first_oncurve) else if (last_offcurve && first_oncurve)
{ {
if (last_offcurve2) if (last_offcurve2)