X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Foffset.cc;h=d6d62d44e5e898417d7f0bdb3823f7792259e7db;hb=d3dbe7293fc45f37ca5248639c999032311eb9fa;hp=7f0a6949e38054783a3dd17b3804c4bebdd096f0;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git

diff --git a/flower/offset.cc b/flower/offset.cc
index 7f0a6949e3..d6d62d44e5 100644
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -3,33 +3,59 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-#include <math.h>
 
-#ifndef STANDALONE
-#include "string.hh"
-#endif
 #include "offset.hh"
 
+#include <cmath>
 
 #ifndef STANDALONE
 String
-Offset::str () const
+Offset::to_string () const
 {
   String s;
-  s = String("(") + to_str (coordinate_a_[X_AXIS]) + ", " 
-    + to_str (coordinate_a_[Y_AXIS]) + ")";
+  s = String (" (") + ::to_string (coordinate_a_[X_AXIS]) + ", "
+    + ::to_string (coordinate_a_[Y_AXIS]) + ")";
   return s;
 }
 #endif
 
+bool
+isinf_b (Real r)
+{
+  return (fabs (r) > 1e20);
+}
+
+/*
+  free bsd fix by John Galbraith
+*/
+
 Offset
 complex_multiply (Offset z1, Offset z2)
 {
   Offset z;
-  z[X_AXIS] = z1[X_AXIS] * z2[X_AXIS] - z1[Y_AXIS]*z2[Y_AXIS];
-  z[Y_AXIS] = z1[X_AXIS] * z2[Y_AXIS] + z1[Y_AXIS] * z2[X_AXIS];
+  if (!isinf_b (z2[Y_AXIS]))
+    {
+      z[X_AXIS] = z1[X_AXIS] * z2[X_AXIS] - z1[Y_AXIS] * z2[Y_AXIS];
+      z[Y_AXIS] = z1[X_AXIS] * z2[Y_AXIS] + z1[Y_AXIS] * z2[X_AXIS];
+    }
+  return z;
+}
+
+Offset
+complex_conjugate (Offset o)
+{
+  o[Y_AXIS] = -o[Y_AXIS];
+  return o;
+}
+
+Offset
+complex_divide (Offset z1, Offset z2)
+{
+  z2 = complex_conjugate (z2);
+  Offset z = complex_multiply (z1, z2);
+  z *= 1 / z2.length ();
   return z;
 }
 
@@ -38,28 +64,23 @@ complex_exp (Offset o)
 {
   Real s = sin (o[Y_AXIS]);
   Real c = cos (o[Y_AXIS]);
-  
+
   Real r = exp (o[X_AXIS]);
 
-  return Offset(r*c, r*s);
+  return Offset (r * c, r * s);
 }
 
 Real
 Offset::arg () const
 {
-  return atan2 (y (), x());
+  return atan2 (coordinate_a_[Y_AXIS], coordinate_a_[X_AXIS]);
 }
 
 /**
    euclidian vector length / complex modulus
- */
+*/
 Real
 Offset::length () const
 {
-  return sqrt (sqr (x()) + sqr (y()));
-}
-void
-Offset::mirror (Axis a)
-{
-  coordinate_a_[a] = - coordinate_a_[a];
+  return sqrt (sqr (coordinate_a_[X_AXIS]) + sqr (coordinate_a_[Y_AXIS]));
 }