X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch.cc;h=b26076a0083c88efcb48ee476e2e2efe7526dc38;hb=89a6997b2b200a5f055d85e76d140e9d49ce4e1e;hp=facbf5d05d193049353a8af54013dc7477940fa1;hpb=2d1c4f3cf55ee691624575a2a3dd6789a3e80fdc;p=lilypond.git diff --git a/lily/pitch.cc b/lily/pitch.cc index facbf5d05d..b26076a008 100644 --- a/lily/pitch.cc +++ b/lily/pitch.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1998--2011 Han-Wen Nienhuys + Copyright (C) 1998--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 @@ -57,7 +57,7 @@ Pitch::compare (Pitch const &m1, Pitch const &m2) if (n) return n; if (a) - return a > (Rational)0; + return a > (Rational)0 ? 1 : -1; return 0; } @@ -79,13 +79,13 @@ Pitch::tone_pitch () const int Pitch::rounded_semitone_pitch () const { - return int (floor (double (tone_pitch () * Rational (2) + Rational (1,2)))); + return int (floor (double (tone_pitch () * Rational (2) + Rational (1, 2)))); } int Pitch::rounded_quartertone_pitch () const { - return int (floor (double (tone_pitch () * Rational (4) + Rational (1,2)))); + return int (floor (double (tone_pitch () * Rational (4) + Rational (1, 2)))); } void