release: 0.1.58

[lilypond.git] / flower / offset.cc

diff --git a/flower/offset.cc b/flower/offset.cc
index ba1fee0075bdc80fda3dad0ea32771d58bd5d0ac..232967e675d4ea913df6d5833f51f62e5b0057b0 100644 (file)
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -11,6 +11,7 @@
 #include "offset.hh"
 
 
+#ifndef STANDALONE
 String
 Offset::str () const
 {
@@ -18,14 +19,14 @@ Offset::str () const
   s = String("(") + coordinate_a_[X_AXIS] + ", " + coordinate_a_[Y_AXIS] + ")";
   return s;
 }
-
+#endif
 
 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];
+  z[Y_AXIS] = z1[X_AXIS] * z2[Y_AXIS] + z1[Y_AXIS] * z2[X_AXIS];
   return z;
 }