X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmisc.cc;h=6cafa2b50b3669fac258e5d2b1d3e51cdb737db1;hb=6bd95e9f5b759548122f5ca35ac478ce5b116623;hp=58d0a6e9d301af63baead8b7e8f96d2f7cb0d0ff;hpb=f0eca19f1dc9ffddf98eadf39800405fe4d3e7a5;p=lilypond.git diff --git a/lily/misc.cc b/lily/misc.cc index 58d0a6e9d3..6cafa2b50b 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--2012 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify @@ -18,30 +18,10 @@ along with LilyPond. If not, see . */ -#include - #include "misc.hh" #include "offset.hh" #include "warn.hh" -/* - Return the 2-log, rounded down -*/ -int -intlog2 (int d) -{ - assert (d); - int i = 0; - while ((d != 1)) - { - d /= 2; - i++; - } - - assert (! (d / 2)); - return i; -} - double log_2 (double x) { @@ -97,20 +77,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 orig_c (orig[X_AXIS], orig[Y_AXIS]); - complex to_move = polar (dist, angle); - complex res = orig_c + to_move; - - return Offset (real (res), imag (res)); -}