Issue 4550 (1/2) Avoid "using namespace std;" in included files

[lilypond.git] / lily / bezier.cc

diff --git a/lily/bezier.cc b/lily/bezier.cc
index d9267124037f329b37c6a9d2c7a5e68ad521fcfe..e2c099b31b9205a46645d7a5cc68edb48b3581f0 100644 (file)
--- a/lily/bezier.cc
+++ b/lily/bezier.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2012 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@
 #include "warn.hh"
 #include "libc-extension.hh"
 
+using std::vector;
+
 Real binomial_coefficient_3[]
 =
 {
@@ -140,8 +142,9 @@ Bezier::curve_point (Real t) const
   return o;
 }
 
-Real
-Bezier::slope_at_point (Real t) const
+// The return value is normalized unless zero or indefinite.
+Offset
+Bezier::dir_at_point (Real t) const
 {
   Offset second_order[3];
   Offset third_order[2];
@@ -152,10 +155,7 @@ Bezier::slope_at_point (Real t) const
   for (vsize i = 0; i < 2; i++)
     third_order[i] = ((second_order[i + 1] - second_order[i]) * t) + second_order[i];
 
-  if (third_order[1][X_AXIS] - third_order[0][X_AXIS] == 0)
-    return infinity_f;
-
-  return (third_order[1][Y_AXIS] - third_order[0][Y_AXIS]) / (third_order[1][X_AXIS] - third_order[0][X_AXIS]);
+  return (third_order[1] - third_order[0]).direction ();
 }
 
 /*