From: Keith OHara <k-ohara5a5a@oco.net>
Date: Mon, 22 Dec 2014 04:15:46 +0000 (-0800)
Subject: skylines: remove unused function
X-Git-Tag: release/2.19.16-1~2^2~38^2~33
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4c792504d7780b2da43434a9c29d1ec74ea7c6db;p=lilypond.git

skylines: remove unused function
---

diff --git a/lily/include/skyline-pair.hh b/lily/include/skyline-pair.hh
index 73b5586029..8712b66c42 100644
--- a/lily/include/skyline-pair.hh
+++ b/lily/include/skyline-pair.hh
@@ -40,7 +40,6 @@ public:
   Real right () const;
   void raise (Real);
   void shift (Real);
-  void deholify ();
   void insert (Box const &, Axis);
   void merge (Skyline_pair const &other);
   Skyline &operator [] (Direction d);
diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh
index 8e75123cda..536274161b 100644
--- a/lily/include/skyline.hh
+++ b/lily/include/skyline.hh
@@ -73,7 +73,6 @@ public:
   Skyline (Box const &b, Axis a, Direction sky);
 
   vector<Offset> to_points (Axis) const;
-  void deholify ();
   void merge (Skyline const &);
   void insert (Box const &, Axis);
   void print () const;
diff --git a/lily/skyline-pair.cc b/lily/skyline-pair.cc
index 205fd889d5..75f77fd5b2 100644
--- a/lily/skyline-pair.cc
+++ b/lily/skyline-pair.cc
@@ -54,13 +54,6 @@ Skyline_pair::raise (Real r)
   skylines_[DOWN].raise (r);
 }
 
-void
-Skyline_pair::deholify ()
-{
-  skylines_[UP].deholify ();
-  skylines_[DOWN].deholify ();
-}
-
 void
 Skyline_pair::shift (Real r)
 {
diff --git a/lily/skyline.cc b/lily/skyline.cc
index ab7e45a30b..c8c6d347f8 100644
--- a/lily/skyline.cc
+++ b/lily/skyline.cc
@@ -232,32 +232,6 @@ Skyline::normalize ()
   assert (buildings_.back ().end_ == infinity_f);
 }
 
-void
-Skyline::deholify ()
-{
-  // Since a skyline should always be normalized, we can
-  // assume that there are never two adjacent empty buildings.
-  // That is, if center is empty then left and right are not.
-  list<Building>::iterator left = buildings_.begin ();
-  list<Building>::iterator center = buildings_.begin ();
-  list<Building>::iterator right;
-
-  for (right = buildings_.begin (); right != buildings_.end (); right++)
-    {
-      if (center != buildings_.begin () && center->y_intercept_ == -infinity_f)
-        {
-          printf ("We are here");
-          exit (17); // not-reached
-          Real p1 = left->height (left->end_);
-          Real p2 = right->height (right->start_);
-          *center = Building (center->start_, p1, p2, center->end_);
-
-          left = center;
-          center = right;
-        }
-    }
-}
-
 void
 Skyline::internal_merge_skyline (list<Building> *s1, list<Building> *s2,
                                  list<Building> *const result) const
diff --git a/lily/stencil-integral.cc b/lily/stencil-integral.cc
index c455503c2f..91f1333867 100644
--- a/lily/stencil-integral.cc
+++ b/lily/stencil-integral.cc
@@ -1058,7 +1058,6 @@ Stencil::skylines_from_stencil (SCM sten, Real pad, Axis a)
   for (DOWN_and_UP (d))
     out[d] = out[d].padded (pad);
 
-  out.deholify ();
   return out.smobbed_copy ();
 }