X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmisc.hh;h=174b2f4c01663be76fed63778e558d03cf708d6f;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=12392c0cacd804dcee2db84c0e0aaec93ef0651a;hpb=b45f2a64f2dba80aea47d596b38068f71402579a;p=lilypond.git

diff --git a/lily/include/misc.hh b/lily/include/misc.hh
index 12392c0cac..174b2f4c01 100644
--- a/lily/include/misc.hh
+++ b/lily/include/misc.hh
@@ -1,9 +1,20 @@
 /*
-  misc.hh -- declare miscellaneous functions.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2009 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 MISC_HH
@@ -16,7 +27,26 @@ using namespace std;
 #include "interval.hh"
 
 double log_2 (double x);
-int intlog2 (int d);
+
+/*
+  Return the 2-log, rounded down
+*/
+template <class T>
+int
+intlog2 (T d)
+{
+  if (d <= 0)
+    error ("intlog2 with negative argument: " + ::to_string (d));
+  int i = 0;
+  while ((d != 1))
+    {
+      d /= 2;
+      i++;
+    }
+
+  assert (! (d / 2));
+  return i;
+}
 
 inline int
 sign (int i)
@@ -31,7 +61,7 @@ sign (int i)
 inline int
 shift_left (int value, int shiftamount)
 {
- if (shiftamount < 0) return (value >> -shiftamount); 
+  if (shiftamount < 0) return (value >> -shiftamount);
   else return (value << shiftamount);
 }
 
@@ -39,14 +69,20 @@ inline Real
 linear_interpolate (Real x, Real x1, Real x2, Real y1, Real y2)
 {
   return (x2 - x) / (x2 - x1) * y1
-    + (x - x1) / (x2 - x1) * y2;
+         + (x - x1) / (x2 - x1) * y2;
+}
+
+inline Real
+normalize (Real x, Real x1, Real x2)
+{
+  return (x - x1) / (x2 - x1);
 }
 
 Real directed_round (Real f, Direction d);
 
-Real peak_around (Real epsilon,  Real threshold, Real x);
+Real peak_around (Real epsilon, Real threshold, Real x);
 Real convex_amplifier (Real standard_x, Real increase_factor, Real x);
-string camel_case_to_lisp_identifier (string in);
+string camel_case_to_lisp_identifier (const string &in);
 
 #endif