release: 0.1.47

[lilypond.git] / flower / include / full-storage.icc

diff --git a/flower/include/full-storage.icc b/flower/include/full-storage.icc
index 06bcc9d70c519168df0ec0f5bf57cfa6ecf5096a..359edb6b4ceca3d4780ef7cad25d397b190be7a4 100644 (file)
--- a/flower/include/full-storage.icc
+++ b/flower/include/full-storage.icc
@@ -14,78 +14,79 @@
 INLINE void
 Full_storage::init()
 {
-    els_p_p_=0;
-    height_i_=width_i_=max_height_i_=max_width_i_=0;
+  els_p_p_=0;
+  height_i_=width_i_=max_height_i_=max_width_i_=0;
 }
 INLINE bool
-Full_storage::valid(int i, int j)const
+Full_storage::valid (int i, int j) const
 {
-    return (i>=0 && i < height_i_)
-       && (j < width_i_ && j >=0);
+  return (i>=0 && i < height_i_)
+    && (j < width_i_ && j >=0);
 }
 
 
 INLINE
-Full_storage::Full_storage(Full_storage const&s)
+Full_storage::Full_storage (Full_storage const&s)
+  : Matrix_storage (s)
 {
-    init();
-    (*this) = s;
+  init();
+  (*this) = s;
 }
 
 INLINE Real& 
-Full_storage::elem(int i,int j)
+Full_storage::elem (int i,int j)
 {
-    assert(valid(i,j));
-    return els_p_p_[i][j];
+  assert (valid (i,j));
+  return els_p_p_[i][j];
 }
 
 INLINE Real
-Full_storage::elem(int i, int j) const {
-    assert(valid(i,j));
-    return els_p_p_[i][j];
+Full_storage::elem (int i, int j) const {
+  assert (valid (i,j));
+  return els_p_p_[i][j];
 }
 
 INLINE
 Full_storage::Full_storage() {
-    init();
+  init();
 }
 
 
 INLINE int
 Full_storage::rows() const
 {
-    return height_i_;
+  return height_i_;
 }
 INLINE int
 Full_storage::cols() const
 {
-    return width_i_;
+  return width_i_;
 }
 INLINE int
-Full_storage::dim()const
+Full_storage::dim() const
 {
-    assert (rows()==cols());
-    return rows();
+  assert (rows()==cols ());
+  return rows();
 }
 
 INLINE void
-Full_storage::resize(int i)
+Full_storage::resize (int i)
 {
-    resize(i,i);
+  resize (i,i);
 }
 
 INLINE   
-Full_storage::Full_storage(int i,int j)
+Full_storage::Full_storage (int i,int j)
 {
-    init();
-    set_size(i,j);
+  init();
+  set_size (i,j);
 }
 
 INLINE 
-Full_storage::Full_storage(int i)
+Full_storage::Full_storage (int i)
 {
-    init();
-    set_size(i);
+  init();
+  set_size (i);
 }
  
 INLINE