Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond into...

[lilypond.git] / lily / skyline.cc

diff --git a/lily/skyline.cc b/lily/skyline.cc
index 5297f6359ab91ea58642e9f552eca313031217ac..e733cfd0802ffab5f5c71328b66d8d4ddd173965 100644 (file)
--- a/lily/skyline.cc
+++ b/lily/skyline.cc
@@ -2,11 +2,12 @@
 
    source file of the GNU LilyPond music typesetter
  
-   (c) 2006--2007 Joe Neeman <joeneeman@gmail.com>
+   (c) 2006--2009 Joe Neeman <joeneeman@gmail.com>
 */
 
 #include "skyline.hh"
 #include <deque>
+#include <cstdio>
 
 #include "ly-smobs.icc"
 
@@ -317,7 +318,7 @@ Skyline::internal_build_skyline (list<Box> *boxes, Real horizon_padding, Axis ho
     {
       list<Building> result;
       single_skyline (Building (boxes->front (), horizon_padding, horizon_axis, sky),
-                     boxes->front ()[horizon_axis][LEFT], horizon_axis, &result);
+                     boxes->front ()[horizon_axis][LEFT], horizon_padding, &result);
       return result;
     }
 
@@ -541,6 +542,12 @@ Skyline::is_empty () const
   return b.end_ == infinity_f && b.y_intercept_ == -infinity_f;
 }
 
+void
+Skyline::clear ()
+{
+  buildings_.clear ();
+  empty_skyline (&buildings_);
+}
 
 /****************************************************************/