X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flookup.cc;h=aec43fe8fb9eb41c7a763a7a6ab1b0674e928c5a;hb=319a81614622698d9e6aed8d6997ad0461c6614c;hp=671c0da04e38e93c0e12f418f79bc9db92e9bcbd;hpb=86256511ff93fa202110df55edaf8880ec699db0;p=lilypond.git diff --git a/lily/lookup.cc b/lily/lookup.cc index 671c0da04e..aec43fe8fb 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -1,11 +1,22 @@ /* - lookup.cc -- implement simple Lookup methods. + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter - - (c) 1997--2009 Han-Wen Nienhuys + Copyright (C) 1997--2011 Han-Wen Nienhuys Jan Nieuwenhuizen + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "lookup.hh" @@ -390,7 +401,7 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick, Bezier back_dash, curve_dash; Real seg_length = (back_segment.control_[3] - back_segment.control_[0]).length (); - int pattern_count = seg_length / dash_period; + int pattern_count = (int) (seg_length / dash_period); Real pattern_length = 1.0 / (pattern_count + dash_fraction); Real start_t, end_t; for (int p = 0; p <= pattern_count; p++) @@ -523,6 +534,7 @@ Lookup::triangle (Interval iv, Real thick, Real protrude) points.push_back (Offset (iv[LEFT], 0)); points.push_back (Offset (iv[RIGHT], 0)); points.push_back (Offset (iv.center (), protrude)); + points.push_back (Offset (iv[LEFT], 0)); // close triangle return points_to_line_stencil (thick, points);