X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fskyline.cc;h=b3b6349461a25369fffab2aaf0f954a05f359c71;hb=32f10f1e5741ddadbae0ed5d4bd3008a22fb6fb9;hp=bbbf7f55808b15939c796546ee6d341a166cbbd2;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git diff --git a/lily/skyline.cc b/lily/skyline.cc index bbbf7f5580..b3b6349461 100644 --- a/lily/skyline.cc +++ b/lily/skyline.cc @@ -68,7 +68,7 @@ insert_extent_into_skyline (Array *line, Box b, Axis line_axis, if (!w.is_empty () && w.length () > EPS - && d* (my_height - stick_out) < 0) + && d * (my_height - stick_out) < 0) { Interval e1 (line->elem (i).width_[LEFT], extent[LEFT]); Interval e3 (extent[RIGHT], line->elem (i).width_[RIGHT]); @@ -81,12 +81,11 @@ insert_extent_into_skyline (Array *line, Box b, Axis line_axis, if (!e1.is_empty () && e1.length () > EPS) line->insert (Skyline_entry (e1, my_height), i); } - } } void -merge_skyline (Array * a1, +merge_skyline (Array *a1, Array const &a2, Direction dir) { @@ -180,7 +179,6 @@ Skyline_entry::Skyline_entry (Interval i, Real r) { width_ = i; height_ = r; - } void