X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmisc.cc;h=bd7cce55c7e4fc887e3985d18c5ba20ec107d225;hb=874fecc2e70c51d2ad34f1677496292a5c56e63d;hp=946e27e4bb4025d8c88fc79da6c77e080cdb978f;hpb=1a66290a98e7de8d6d41485b5b71a9f7e1fe35c7;p=lilypond.git

diff --git a/lily/misc.cc b/lily/misc.cc
index 946e27e4bb..bd7cce55c7 100644
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -3,43 +3,34 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+    Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <math.h>
-
-#include "item.hh"
 #include "misc.hh"
-#include "moment.hh"
 
+/*
+  Return the 2-log, rounded down 
+ */
 int
-intlog2(int d) {
-    int i=0;
-    while (!(d&1)) {
-	d/= 2;
-	i++;
+intlog2 (int d)
+{
+  assert (d);
+  int i=0;
+  while ((d != 1)) 
+    {
+      d /= 2;
+      i++;
     }
-    assert (!(d/2));
-    return i;
+  
+  assert (! (d/2));
+  return i;
 }
 
 double
-log_2(double x) {
-    return log (x)  /log (2.0);
-}
-
-#if 1
-Interval
-itemlist_width (const Array<Item*> &its)
+log_2 (double x)
 {
-    Interval iv ;
-    iv.set_empty();
-     
-    for (int j =0; j < its.size(); j++){
-	iv.unite (its[j]->width());
-
-    }
-    return iv;
+  return log (x)  /log (2.0);
 }
 
-#endif