release: 1.1.38

[lilypond.git] / flower / offset.cc

diff --git a/flower/offset.cc b/flower/offset.cc
index 916640e692f305149766da9da6f3a093c9cd612a..258cc1782cc4a63ca2e39001a26fddb1402b8c30 100644 (file)
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -24,15 +24,25 @@ Offset::str () const
 }
 #endif
 
+
+/*
+  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(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_exp (Offset o)
 {