X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Foffset.cc;h=0554e6b2e951be590bb5db02bb35f12bbde04411;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=0287022dcef6da388885cef2605090bbd863a834;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git diff --git a/flower/offset.cc b/flower/offset.cc index 0287022dce..0554e6b2e9 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--2010 Han-Wen Nienhuys + Copyright (C) 1997--2015 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; }