From e86f6ec25d504aaedd55cd2d062194b6c29802fd Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Mon, 22 Mar 2004 08:49:37 +0000 Subject: [PATCH] lily/stem.cc (Stem::extremal_heads, Stem::note_head_positions), lily/dot-column.cc (Dot_column::do_shifts), lily/note-column.cc (Note_column::head_position_interval): Do proper rounding for calls to Staff_symbol_referencer::get_position. --- ChangeLog | 7 +++++++ lily/dot-column.cc | 3 ++- lily/note-column.cc | 2 +- lily/stem.cc | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a0c3cc5f38..21c210112f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-03-22 Werner Lemberg + + lily/stem.cc (Stem::extremal_heads, Stem::note_head_positions), + lily/dot-column.cc (Dot_column::do_shifts), lily/note-column.cc + (Note_column::head_position_interval): Do proper rounding for + calls to Staff_symbol_referencer::get_position. + 2004-03-21 Werner Lemberg * lily/score.cc (ly_run_translator), lily/paper-def.cc diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 46448cd95f..523e2955f4 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -7,6 +7,7 @@ */ #include +#include #include #include "dots.hh" @@ -271,7 +272,7 @@ Dot_column::do_shifts (Grob*me) dp.extremal_head_ = Stem::first_head (stem) == note; } - int p = int (Staff_symbol_referencer::get_position (dp.dot_)); + int p = (int)rint (Staff_symbol_referencer::get_position (dp.dot_)); dp.pos_= p; if (dp.extremal_head_) diff --git a/lily/note-column.cc b/lily/note-column.cc index 84ac1db2df..123535c75e 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -59,7 +59,7 @@ Note_column::head_positions_interval (Grob *me) { Grob *se = unsmob_grob (ly_car (h)); - int j = int (Staff_symbol_referencer::get_position (se)); + int j = (int)rint (Staff_symbol_referencer::get_position (se)); iv.unite (Slice (j,j)); } return iv; diff --git a/lily/stem.cc b/lily/stem.cc index 30fc0040c8..3562170668 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -194,7 +194,7 @@ Stem::extremal_heads (Grob*me) Grob * n = unsmob_grob (ly_car (s)); - int p = int (Staff_symbol_referencer::get_position (n)); + int p = (int)rint (Staff_symbol_referencer::get_position (n)); Direction d = LEFT; do { @@ -225,7 +225,7 @@ Stem::note_head_positions (Grob *me) for (SCM s = me->get_property ("note-heads"); gh_pair_p (s); s = ly_cdr (s)) { Grob * n = unsmob_grob (ly_car (s)); - int p = int (Staff_symbol_referencer::get_position (n)); + int p = (int)rint (Staff_symbol_referencer::get_position (n)); ps.push (p); } -- 2.39.2