X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmisc.cc;h=b930fd521a50e4eb2c93d69736591cac7a7b402e;hb=bb4145a91ce88d58237c52bc8b6c300eaba3b442;hp=f104f98baa7be06dc611011d5995d97bddb72fb5;hpb=0b544cfb7332615ef809b71b57ab656741311ae1;p=lilypond.git

diff --git a/lily/misc.cc b/lily/misc.cc
index f104f98baa..b930fd521a 100644
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -18,8 +18,6 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <complex>
-
 #include "misc.hh"
 #include "offset.hh"
 #include "warn.hh"
@@ -30,7 +28,8 @@
 int
 intlog2 (int d)
 {
-  assert (d);
+  if (d <= 0)
+    error ("intlog2 with negative argument: " + ::to_string (d));
   int i = 0;
   while ((d != 1))
     {
@@ -97,20 +96,3 @@ camel_case_to_lisp_identifier (const string &in)
 
   return result;
 }
-
-Offset
-get_point_in_y_direction (Offset orig, Real slope, Real dist, Direction dir)
-{
-  if (slope == infinity_f)
-    return orig + Offset (dir * dist, 0.0);
-
-  Real x = slope == 0.0 ? 1.0 * dir : 1.0 * sign (slope) * dir;
-  Real y = slope * x;
-  Real angle = atan2 (y, x);
-
-  complex<Real> orig_c (orig[X_AXIS], orig[Y_AXIS]);
-  complex<Real> to_move = polar (dist, angle);
-  complex<Real> res = orig_c + to_move;
-
-  return Offset (real (res), imag (res));
-}