X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspring.cc;h=312b2ed00f49644598966832b50d1598396eae3b;hb=623fac8d645e4078af36758af5d437c5eb39e793;hp=fc5b18f781f142de19cdd2cd55a8fab1e09ef58f;hpb=bb8a0a5387af94dd2702877256334b160575a730;p=lilypond.git diff --git a/lily/spring.cc b/lily/spring.cc index fc5b18f781..312b2ed00f 100644 --- a/lily/spring.cc +++ b/lily/spring.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2007--2011 Joe Neeman + Copyright (C) 2007--2012 Joe Neeman LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -97,9 +97,9 @@ merge_springs (vector const &springs) min_distance = max (springs[i].min_distance (), min_distance); } - avg_stretch /= springs.size (); - avg_compress /= springs.size (); - avg_distance /= springs.size (); + avg_stretch /= Real (springs.size ()); + avg_compress /= Real (springs.size ()); + avg_distance /= Real (springs.size ()); avg_distance = max (min_distance + 0.3, avg_distance); Spring ret = Spring (avg_distance, min_distance);