X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-system-scheme.cc;h=c8f515aa52051b9daddb39b3de4de18430f93f21;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=7c4dc88d095b0f7985e6eee575ae60429bfdf1f3;hpb=bb8a0a5387af94dd2702877256334b160575a730;p=lilypond.git diff --git a/lily/paper-system-scheme.cc b/lily/paper-system-scheme.cc index 7c4dc88d09..c8f515aa52 100644 --- a/lily/paper-system-scheme.cc +++ b/lily/paper-system-scheme.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2008--2011 Han-Wen Nienhuys + Copyright (C) 2008--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -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];