X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitch.cc;h=bf2fd714ac4a61fb0aac0c9b057980f1cb8f413c;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=facbf5d05d193049353a8af54013dc7477940fa1;hpb=5f1308c20d09eb5385f746e7ee05932ae079b5a6;p=lilypond.git diff --git a/lily/pitch.cc b/lily/pitch.cc index facbf5d05d..bf2fd714ac 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--2014 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