Merge branch 'issue4032'

[lilypond.git] / lily / paper-system-scheme.cc

diff --git a/lily/paper-system-scheme.cc b/lily/paper-system-scheme.cc
index b20609a40d5658d9f269c6b611c96d1a9fcbdc49..b679d87c5ce6141ddebf1b086c135cd031278e92 100644 (file)
--- a/lily/paper-system-scheme.cc
+++ b/lily/paper-system-scheme.cc
@@ -37,8 +37,8 @@ LY_DEFINE (ly_paper_system_minimum_distance, "ly:paper-system-minimum-distance",
            " their extents otherwise.")
 {
   Real ret = 0;
-  Prob *p1 = unsmob_prob (sys1);
-  Prob *p2 = unsmob_prob (sys2);
+  Prob *p1 = Prob::unsmob (sys1);
+  Prob *p2 = Prob::unsmob (sys2);
   Skyline_pair *sky1 = Skyline_pair::unsmob (p1->get_property ("vertical-skylines"));
   Skyline_pair *sky2 = Skyline_pair::unsmob (p2->get_property ("vertical-skylines"));
 
@@ -46,8 +46,8 @@ LY_DEFINE (ly_paper_system_minimum_distance, "ly:paper-system-minimum-distance",
     ret = (*sky1)[DOWN].distance ((*sky2)[UP]);
   else
     {
-      Stencil *s1 = unsmob_stencil (p1->get_property ("stencil"));
-      Stencil *s2 = unsmob_stencil (p2->get_property ("stencil"));
+      Stencil *s1 = Stencil::unsmob (p1->get_property ("stencil"));
+      Stencil *s2 = Stencil::unsmob (p2->get_property ("stencil"));
       Interval iv1 = s1->extent (Y_AXIS);
       Interval iv2 = s2->extent (Y_AXIS);
       ret = iv2[UP] - iv1[DOWN];