Merge branch 'master' of git://git.savannah.gnu.org/lilypond.git

[lilypond.git] / lily / multi-measure-rest.cc

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 812fd100e41621f0eaa78964fcfc21517684da30..1a9f5e11a7801d9f50cc57e5ad3bec1375be6b86 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -127,7 +127,7 @@ measure_duration_log (Grob *me)
   bool round = to_boolean (me->get_property ("round-to-longer-rest"));
   Rational ml = (unsmob_moment (sml)) ? unsmob_moment (sml)->main_part_ : Rational (1);
 
-  double duration_log = -log2 (ml.Rational::to_double ());
+  double duration_log = -log_2 (ml.Rational::to_double ());
   int measure_duration_log = int (ceil (duration_log));
   if (round && duration_log - measure_duration_log < 0)
     measure_duration_log--;
@@ -243,7 +243,7 @@ Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measures,
     do
     {
       i++;
-      length = int (pow (2, -i));
+      length = int (pow (2.0, -i));
     }
     while (i <= 0 &&
            !(l >= length && mdl >= longest_church_rest - i));