From de4ebf7f3c3af47ea8411ec1b0cb2a12ecf686e3 Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Thu, 1 Feb 2007 22:50:56 +0200 Subject: [PATCH] Shutup warnings about springs of length 0 --- lily/page-spacing.cc | 2 +- lily/simple-spacer.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lily/page-spacing.cc b/lily/page-spacing.cc index 0b8f8295d6..7803cc06f2 100644 --- a/lily/page-spacing.cc +++ b/lily/page-spacing.cc @@ -91,7 +91,7 @@ compress_lines (const vector &orig) for (vsize i = 0; i < orig.size (); i++) { - if (ret.size () && ret.back ().page_permission_ == SCM_EOL) + if (ret.size () && !scm_is_symbol (ret.back ().page_permission_)) { Line_details const &old = ret.back (); Line_details compressed = orig[i]; diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc index 9200554822..3f4e678cd6 100644 --- a/lily/simple-spacer.cc +++ b/lily/simple-spacer.cc @@ -274,7 +274,7 @@ bool Spring_description::is_sane () const { return (inverse_hooke_ >= 0) - && ideal_ > 0 + && ideal_ >= 0 && !isinf (ideal_) && !isnan (ideal_) && (inverse_hooke_ == 0.0 || fabs (inverse_hooke_) > 1e-8) ; -- 2.39.2