X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdimension-cache.cc;h=3eb0a89cb31c5e0f8cebcb6d90d3da58dba6fbec;hb=e0aab07a7c2d53c50f04e349504f95e9d00ece31;hp=3254e5e81971b4b7c4fdbcdd27e0917658a13ea6;hpb=4ecdbd7d70ca7441be4dddd15ac01cc255bc2a35;p=lilypond.git

diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc
index 3254e5e819..3eb0a89cb3 100644
--- a/lily/dimension-cache.cc
+++ b/lily/dimension-cache.cc
@@ -3,25 +3,21 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include <cmath>
-using namespace std;
 
 #include "dimension-cache.hh"
+
 #include "warn.hh"
 #include "grob.hh"
 
 Dimension_cache::Dimension_cache (Dimension_cache const &d)
 {
   init ();
-  dimension_ = d.dimension_;
-  dimension_callback_ = d.dimension_callback_;
-  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;
 }
 
 Dimension_cache::Dimension_cache ()
@@ -32,13 +28,21 @@ Dimension_cache::Dimension_cache ()
 void
 Dimension_cache::init ()
 {
-  dimension_ = SCM_EOL;
-  dimension_callback_ = SCM_EOL;
-
-  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;
+}