resolve merge

[lilypond.git] / lily / include / bezier.hh

diff --git a/lily/include/bezier.hh b/lily/include/bezier.hh
index a04d449725ab17f346df4d20daa5286df7de0d4c..bd66558a19a179d4eae5aa28958c4b062541d3f2 100644 (file)
--- a/lily/include/bezier.hh
+++ b/lily/include/bezier.hh
@@ -1,7 +1,20 @@
 /*
-  bezier.hh -- declare Bezier and Bezier_bow
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+
+  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 <http://www.gnu.org/licenses/>.
 */
 
 #ifndef BEZIER_HH
@@ -22,6 +35,8 @@ public:
   void reverse ();
   void rotate (Real);
   void translate (Offset);
+  void subdivide (Real, Bezier *, Bezier *) const;
+  Bezier extract (Real, Real) const;
 
   Real get_other_coordinate (Axis a, Real x) const;
   vector<Real> solve_point (Axis, Real coordinate) const;