fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 18:08:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[stroke] Simplify dash-off logic.

Browse source 
Remove a redundant level of if-else branching (and remove a duplicate
code) block by testing dash_on first.
This commit is contained in:
Chris Wilson 2008-10-04 12:39:21 +01:00
parent 4aa0991a11
commit 6eead4a5f7
1 changed files with 29 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/cairo-path-stroke.c
View file

@ -872,48 +872,39 @@ _cairo_stroker_line_to_dashed (void *closure, cairo_point_t *point)
segment.p2.x = _cairo_fixed_from_double (dx2) + p1->x; segment.p2.x = _cairo_fixed_from_double (dx2) + p1->x;
segment.p2.y = _cairo_fixed_from_double (dy2) + p1->y; segment.p2.y = _cairo_fixed_from_double (dy2) + p1->y;
if (fully_in_bounds || if (stroker->dash_on &&
_cairo_box_intersects_line_segment (&stroker->bounds, &segment)) (fully_in_bounds ||
_cairo_box_intersects_line_segment (&stroker->bounds, &segment)))
{ {
if (stroker->dash_on) { status = _cairo_stroker_add_sub_edge (stroker, &segment.p1, &segment.p2, &dev_slope, slope_dx, slope_dy, &sub_start, &sub_end);
status = _cairo_stroker_add_sub_edge (stroker, &segment.p1, &segment.p2, &dev_slope, slope_dx, slope_dy, &sub_start, &sub_end); if (status)
return status;
if (stroker->has_current_face) {
/* Join with final face from previous segment */
status = _cairo_stroker_join (stroker, &stroker->current_face, &sub_start);
stroker->has_current_face = FALSE;
if (status) if (status)
return status; return status;
} else if (!stroker->has_first_face && stroker->dash_starts_on) {
if (stroker->has_current_face) { /* Save sub path's first face in case needed for closing join */
/* Join with final face from previous segment */ stroker->first_face = sub_start;
status = _cairo_stroker_join (stroker, &stroker->current_face, &sub_start); stroker->has_first_face = TRUE;
stroker->has_current_face = FALSE;
if (status)
return status;
} else if (!stroker->has_first_face && stroker->dash_starts_on) {
/* Save sub path's first face in case needed for closing join */
stroker->first_face = sub_start;
stroker->has_first_face = TRUE;
} else {
/* Cap dash start if not connecting to a previous segment */
status = _cairo_stroker_add_leading_cap (stroker, &sub_start);
if (status)
return status;
}
if (remain) {
/* Cap dash end if not at end of segment */
status = _cairo_stroker_add_trailing_cap (stroker, &sub_end);
if (status)
return status;
} else {
stroker->current_face = sub_end;
stroker->has_current_face = TRUE;
}
} else { } else {
if (stroker->has_current_face) { /* Cap dash start if not connecting to a previous segment */
/* Cap final face from previous segment */ status = _cairo_stroker_add_leading_cap (stroker, &sub_start);
status = _cairo_stroker_add_trailing_cap (stroker, &stroker->current_face); if (status)
if (status) return status;
return status; }
stroker->has_current_face = FALSE;
} if (remain) {
/* Cap dash end if not at end of segment */
status = _cairo_stroker_add_trailing_cap (stroker, &sub_end);
if (status)
return status;
} else {
stroker->current_face = sub_end;
stroker->has_current_face = TRUE;
} }
} else { } else {
if (stroker->has_current_face) { if (stroker->has_current_face) {