Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / note-collision.cc

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index d9a08dcdc87741f8f7b50b1466e8c4b40c8af208..1df0a6c7aba7f8d0ff68ef226ee174fae7c089b8 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -305,9 +305,7 @@ Note_collision_interface::calc_positioning_done (SCM smob)
       if (cg[d].size ())
        {
          Grob *h = cg[d][0];
-         Grob *fh = Note_column::first_head (h);
-         if (fh)
-           wid = fh->extent (h, X_AXIS).length ();
+         wid = Note_column::first_head (h)->extent (h, X_AXIS).length ();
        }
     }
   while (flip (&d) != UP);
@@ -371,7 +369,7 @@ Note_collision_interface::get_clash_groups (Grob *me)
   do
     {
       vector<Grob*> &clashes (clash_groups[d]);
-      vector_sort (clashes, Note_column::shift_less);
+      vector_sort (clashes, Note_column::shift_compare);
     }
   while ((flip (&d)) != UP);