X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fdrul-array.hh;h=6ef5fe1ffe25d43cacb40a926eeb8750bd69b92b;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=e687acf2d7a0d7026a430589ae2f795922542f78;hpb=a276a19dc6bd57832db3107f2f2cbb04cb4677b6;p=lilypond.git

diff --git a/flower/include/drul-array.hh b/flower/include/drul-array.hh
index e687acf2d7..6ef5fe1ffe 100644
--- a/flower/include/drul-array.hh
+++ b/flower/include/drul-array.hh
@@ -1,9 +1,20 @@
 /*
-  drul-array.hh -- declare Drul_array
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  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 DRUL_ARRAY_HH
@@ -33,14 +44,18 @@ struct Drul_array
   {
     return at (d);
   }
-  T const& operator [] (Direction d) const
+  T const &operator [] (Direction d) const
   {
     return at (d);
   }
   Drul_array ()
   {
   }
-  Drul_array (T t1, T t2)
+  Drul_array (T const &t1, T const &t2)
+  {
+    set (t1, t2);
+  }
+  void set (T const &t1, T const &t2)
   {
     array_[0] = t1;
     array_[1] = t2;
@@ -59,7 +74,7 @@ inline Real
 linear_combination (Drul_array<Real> const &d, Real x)
 {
   return ((1.0 - x) * Real (d.at (LEFT))
-	  + (x + 1.0) * Real (d.at (RIGHT))) * 0.5;
+          + (x + 1.0) * Real (d.at (RIGHT))) * 0.5;
 }
 
 #endif /* DRUL_ARRAY_HH */