From: fred <fred>
Date: Tue, 26 Mar 2002 21:48:47 +0000 (+0000)
Subject: lilypond-1.1.38
X-Git-Tag: release/1.5.59~2495
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e99408b652ad2e998510a3933558d3bb8892cab2;p=lilypond.git

lilypond-1.1.38
---

diff --git a/flower/offset.cc b/flower/offset.cc
index 916640e692..258cc1782c 100644
--- 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)
 {