From: fred <fred>
Date: Tue, 26 Mar 2002 22:47:27 +0000 (+0000)
Subject: lilypond-1.3.39
X-Git-Tag: release/1.5.59~1802
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=49d958aaa26e65a1f529308ed452de7934a8833b;p=lilypond.git

lilypond-1.3.39
---

diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc
index f314dbc24e..eb6f7c24a9 100644
--- a/lily/dimension-cache.cc
+++ b/lily/dimension-cache.cc
@@ -5,6 +5,8 @@
   
   (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
+#include <math.h>
+#include "warn.hh"
 
 #include "dimension-cache.hh"
 #include "parray.hh"
@@ -82,7 +84,13 @@ Dimension_cache::get_offset () const
     {
       Offset_cache_callback c = me->off_callbacks_[0];
       me->off_callbacks_.del (0);
-      me->basic_offset_ += (*c) (me);
+      Real r =  (*c) (me);
+      if (isinf (r) || isnan (r))
+	{
+	  r = 0.0;
+	  programming_error ("Infinity or NaN encountered");
+	}
+      me->basic_offset_ +=r;
     }
   return basic_offset_ + extra_offset_;
 }