X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdimension-cache.cc;h=33294db5e62cd37c9a3253554b083f94f6b023de;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=8a1140c290b14431c365e518d840cd05af61fd2b;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git

diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc
index 8a1140c290..33294db5e6 100644
--- a/lily/dimension-cache.cc
+++ b/lily/dimension-cache.cc
@@ -1,14 +1,23 @@
-/*   
-  dimension-cache.cc --  implement Dimension_cache
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-#include "dimension-cache.hh"
+  Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-#include <cmath>
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "dimension-cache.hh"
 
 #include "warn.hh"
 #include "grob.hh"
@@ -16,12 +25,19 @@
 Dimension_cache::Dimension_cache (Dimension_cache const &d)
 {
   init ();
-  dimension_ = d.dimension_;
+  offset_ = d.offset_ ? new Real (*d.offset_) : 0;
+  parent_ = d.parent_;
+  extent_ = d.extent_ ? new Interval (*d.extent_) : 0;
+}
 
-  offset_ = d.offset_;
-  offset_callbacks_ = d.offset_callbacks_;
-  offsets_left_ = d.offsets_left_;
-  parent_ = d.parent_;  
+Dimension_cache &
+Dimension_cache::operator = (Dimension_cache const &d)
+{
+  clear ();
+  offset_ = d.offset_ ? new Real (*d.offset_) : 0;
+  parent_ = d.parent_;
+  extent_ = d.extent_ ? new Interval (*d.extent_) : 0;
+  return *this;
 }
 
 Dimension_cache::Dimension_cache ()
@@ -32,18 +48,21 @@ Dimension_cache::Dimension_cache ()
 void
 Dimension_cache::init ()
 {
-  dimension_ = SCM_EOL;
-
-  offsets_left_ = 0;
-  offset_callbacks_ = SCM_EOL;
-  offset_ =0.0;
-  
-  parent_ =0;
+  offset_ = 0;
+  extent_ = 0;
+  parent_ = 0;
 }
 
+Dimension_cache::~Dimension_cache ()
+{
+  clear ();
+}
 
-
-
-
-
-
+void
+Dimension_cache::clear ()
+{
+  delete extent_;
+  delete offset_;
+  extent_ = 0;
+  offset_ = 0;
+}