release: 1.3.72

[lilypond.git] / lily / bezier.cc

diff --git a/lily/bezier.cc b/lily/bezier.cc
index 72bd0e0f46aafbb9790437fdab209858fd71544a..faf5b899a2662a5c0aaabc347620d1298a97d2e2 100644 (file)
--- a/lily/bezier.cc
+++ b/lily/bezier.cc
@@ -9,7 +9,7 @@
 #include <math.h>
 #include "config.h"
 
-
+#include "libc-extension.hh"
 #include "bezier.hh"
 #include "polynomial.hh"
 
@@ -29,10 +29,13 @@ binomial_coefficient (Real over , int under)
 }
 
 void
-flip (Array<Offset>* arr_p, Axis a)
+scale (Array<Offset>* arr_p, Real x , Real y)
 {
   for (int i = 0; i < arr_p->size (); i++)
-    (*arr_p)[i][a] = - (*arr_p)[i][a];
+    {
+      (*arr_p)[i][X_AXIS] = x* (*arr_p)[i][X_AXIS];
+      (*arr_p)[i][Y_AXIS] = y* (*arr_p)[i][Y_AXIS];
+    }
 }
 
 void
@@ -87,9 +90,10 @@ Bezier::curve_point (Real t)const
        one_min_tj /= (1-t);
     }
 
+#ifdef PARANOID
   assert (fabs (o[X_AXIS] - polynomial (X_AXIS).eval (t))< 1e-8);
   assert (fabs (o[Y_AXIS] - polynomial (Y_AXIS).eval (t))< 1e-8);
-
+#endif
   
   return o;
 }
@@ -152,6 +156,9 @@ Bezier::solve_point (Axis ax, Real coordinate) const
   return filter_solutions (sol);
 }
 
+/**
+   Compute the bounding box dimensions in direction of A.
+ */
 Interval
 Bezier::extent (Axis a)const
 {
@@ -170,11 +177,18 @@ Bezier::extent (Axis a)const
   return iv;
 }
 
+/**
+   Flip around axis A
+ */
+
 void
-Bezier::flip (Axis a)
+Bezier::scale (Real x, Real y)
 {
   for (int i = CONTROL_COUNT; i--;)
-    control_[i][a] = - control_[i][a];
+    {
+      control_[i][X_AXIS] = x * control_[i][X_AXIS];
+      control_[i][Y_AXIS] = y * control_[i][Y_AXIS];
+    }
 }
 
 void