X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdimension-cache.cc;h=90acd455ea989831c7610fe05ba634936e7d90cd;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=749b8aca13fe355e76307dfc7a96f7c072ea751c;hpb=31a6650e2b2a5c1cae3237ee47b80cd43d084d53;p=lilypond.git

diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc
index 749b8aca13..90acd455ea 100644
--- a/lily/dimension-cache.cc
+++ b/lily/dimension-cache.cc
@@ -3,20 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 
 #include "dimension-cache.hh"
+
 #include "warn.hh"
 #include "grob.hh"
 
 Dimension_cache::Dimension_cache (Dimension_cache const &d)
 {
   init ();
-  offset_ = d.offset_;
-  offset_callbacks_ = d.offset_callbacks_;
-  offsets_left_ = d.offsets_left_;
+  offset_ = d.offset_ ? new Real (*d.offset_) : 0;
   parent_ = d.parent_;
   extent_ = d.extent_ ? new Interval (*d.extent_) : 0;
 }
@@ -29,14 +28,21 @@ Dimension_cache::Dimension_cache ()
 void
 Dimension_cache::init ()
 {
-  offsets_left_ = 0;
-  offset_callbacks_ = SCM_EOL;
-  offset_ = 0.0;
+  offset_ = 0;
   extent_ = 0;
   parent_ = 0;
 }
 
 Dimension_cache::~Dimension_cache ()
+{
+  clear ();
+}
+
+void
+Dimension_cache::clear ()
 {
   delete extent_;
+  delete offset_;
+  extent_ = 0;
+  offset_ = 0;
 }