input/regression/bookparts.ly fails at PDF conversion stage

[lilypond.git] / lily / misc.cc

diff --git a/lily/misc.cc b/lily/misc.cc
index 6021380023158cc5df21d570f4be92f570a5fe19..77fbb2137489cb55ed16fe04a205200958a7a381 100644 (file)
--- 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,12 +18,13 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <complex>
-
 #include "misc.hh"
 #include "offset.hh"
 #include "warn.hh"
 
+using std::string;
+using std::vector;
+
 /*
   Return the 2-log, rounded down
 */
@@ -66,7 +67,7 @@ peak_around (Real epsilon, Real threshold, Real x)
 {
   if (x < 0)
     return 1.0;
-  return max (- epsilon * (x - threshold) / ((x + epsilon) * threshold), 0.0);
+  return std::max (- epsilon * (x - threshold) / ((x + epsilon) * threshold), 0.0);
 }
 
 /*
@@ -98,20 +99,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));
-}