CVSROOT:        /cvsroot/lilypond
Module name:    lilypond
Branch:         
Changes by:     Mats Bengtsson <[EMAIL PROTECTED]>      05/09/15 20:17:46

Modified files:
        .              : ChangeLog 
        lily           : tie.cc 

Log message:
        * lily/tie.cc (get_configuration): Replace fabs -> abs for integer
        arguments. Fixes compilation error with gcc 3.3.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4129&tr2=1.4130&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/tie.cc.diff?tr1=1.162&tr2=1.163&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4129 lilypond/ChangeLog:1.4130
--- lilypond/ChangeLog:1.4129   Tue Sep 13 09:02:13 2005
+++ lilypond/ChangeLog  Thu Sep 15 20:17:44 2005
@@ -1,3 +1,8 @@
+2005-09-15  Mats Bengtsson  <[EMAIL PROTECTED]>
+
+       * lily/tie.cc (get_configuration): Replace fabs -> abs for integer
+       arguments. Fixes compilation error with gcc 3.3.
+
 2005-09-13  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
        * stepmake/stepmake/python-module-rules.make
Index: lilypond/lily/tie.cc
diff -u lilypond/lily/tie.cc:1.162 lilypond/lily/tie.cc:1.163
--- lilypond/lily/tie.cc:1.162  Mon Sep 12 23:33:24 2005
+++ lilypond/lily/tie.cc        Thu Sep 15 20:17:45 2005
@@ -325,7 +325,7 @@
    */
   if (conf->position_ == conf->head_position_
       && in_space
-      && Staff_symbol_referencer::staff_radius (me) > fabs (conf->position_) / 
2
+      && Staff_symbol_referencer::staff_radius (me) > abs (conf->position_) / 2
       && dy > 0.3 * staff_space)
     {
       conf->position_ += 2 * conf->dir_; 
@@ -333,13 +333,13 @@
 
   if (!in_between
       && in_space
-      && fabs (conf->position_ - conf->head_position_) <= 1)
+      && abs (conf->position_ - conf->head_position_) <= 1)
     conf->position_ += 2*conf->dir_;
   
   
   if (in_space)
     {
-      if ((fabs (conf->position_ - conf->head_position_) <= 1
+      if ((abs (conf->position_ - conf->head_position_) <= 1
           && fabs (dy) < 0.45 * staff_space)
          || fabs (dy) < 0.6 * staff_space)
        {
@@ -366,7 +366,7 @@
                 + conf->delta_y_) <
          conf->dir_ * conf->head_position_ * 0.5 * staff_space)
        {
-         if (Staff_symbol_referencer::staff_radius (me) >  fabs 
(conf->head_position_) / 2)
+         if (Staff_symbol_referencer::staff_radius (me) >  abs 
(conf->head_position_) / 2)
            conf->position_ +=  2 * conf->dir_;
          else
            conf->position_ += conf->dir_;


_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to