X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Foffset.cc;h=180f8acc61c102d0e8f5bee99bc82b0e8bc86c32;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=41b42d8b9715dfe24697794fe23d8d1683b0d6a0;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git diff --git a/flower/offset.cc b/flower/offset.cc index 41b42d8b97..180f8acc61 100644 --- a/flower/offset.cc +++ b/flower/offset.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Han-Wen Nienhuys + Copyright (C) 1997--2012 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ Offset::to_string () const { string s; s = string (" (") + ::to_string (coordinate_a_[X_AXIS]) + ", " - + ::to_string (coordinate_a_[Y_AXIS]) + ")"; + + ::to_string (coordinate_a_[Y_AXIS]) + ")"; return s; } #endif @@ -91,23 +91,23 @@ Real Offset::length () const { return sqrt (sqr (coordinate_a_[X_AXIS]) - + sqr (coordinate_a_[Y_AXIS])); + + sqr (coordinate_a_[Y_AXIS])); } bool Offset::is_sane () const { return !isnan (coordinate_a_[X_AXIS]) - && !isnan (coordinate_a_ [Y_AXIS]) - && !isinf (coordinate_a_[X_AXIS]) - && !isinf (coordinate_a_[Y_AXIS]); + && !isnan (coordinate_a_ [Y_AXIS]) + && !isinf (coordinate_a_[X_AXIS]) + && !isinf (coordinate_a_[Y_AXIS]); } Offset Offset::direction () const { Offset d = *this; - d /= length (); + d /= length (); return d; }