r11859: Canonicalize whitespace

[ctsim.git] / include / array2d.h

diff --git a/include/array2d.h b/include/array2d.h
index d9081dbd829598a056e697c672b89761ddd7eb1b..a03ae586b79a0917e417f1ec13651095627f61c3 100644 (file)
--- a/include/array2d.h
+++ b/include/array2d.h
@@ -1,10 +1,10 @@
 /*****************************************************************************
 ** FILE IDENTIFICATION
 **
-**     Name:         array2d.h
+**      Name:         array2d.h
 **      Purpose:      2-dimension array classes
-**     Programmer:   Kevin Rosenberg
-**     Date Started: June 2000
+**      Programmer:   Kevin Rosenberg
+**      Date Started: June 2000
 **
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
@@ -31,49 +31,49 @@
 #include "ctsupport.h"
 
 
-template<class T> 
+template<class T>
 class Array2d {
  public:
     Array2d (unsigned int x, unsigned int y)
-       : m_nx(x), m_ny(y), array_data(0)
-       {
-           allocArray();
-       }
+        : m_nx(x), m_ny(y), array_data(0)
+        {
+            allocArray();
+        }
 
     Array2d ()
-       : m_nx(0), m_ny(0), array_data(0)
-       {}
+        : m_nx(0), m_ny(0), array_data(0)
+        {}
 
     ~Array2d ()
-       {
-           deleteArray();
-       }
-    
+        {
+            deleteArray();
+        }
+
     void initSetSize (unsigned int x, unsigned int y)
-       {
-           m_nx = x;
-           m_ny = y;
-           deleteArray();
-           allocArray();
-       }
+        {
+            m_nx = x;
+            m_ny = y;
+            deleteArray();
+            allocArray();
+        }
 
     T** getArray () const
-       { return array_data; }
+        { return array_data; }
 
     T* getColumn (unsigned int x) const
-       { return (array_data ? array_data[x] : NULL); }
+        { return (array_data ? array_data[x] : NULL); }
 
     T getPoint (unsigned int x, unsigned int y) const
-       { return (array_data ? array_data[x][y] : NULL); }
+        { return (array_data ? array_data[x][y] : NULL); }
 
-    unsigned int sizeofPixel () const 
-       {  return sizeof(T); }
+    unsigned int sizeofPixel () const
+        {  return sizeof(T); }
 
     unsigned int sizeofColumn () const
-       { return (sizeof(T) * m_ny); }
+        { return (sizeof(T) * m_ny); }
 
     unsigned int sizeofArray () const
-       { return (sizeof(T) * m_nx * m_ny); }
+        { return (sizeof(T) * m_nx * m_ny); }
 
 
  private:
@@ -82,25 +82,25 @@ class Array2d {
     T** array_data;
 
     void allocArray ()
-       {
-           if (array_data)
-               deleteArray();
+        {
+            if (array_data)
+                deleteArray();
+
+            array_data = new T*[m_nx];
 
-           array_data = new T*[m_nx];
-           
-           for (unsigned int i = 0; i < m_nx; i++)
-               array_data[i] = new T[m_ny];
-       }
+            for (unsigned int i = 0; i < m_nx; i++)
+                array_data[i] = new T[m_ny];
+        }
 
     void deleteArray ()
-       {
-           if (array_data) {
-               for (unsigned int i = 0; i < m_nx; i++)
-                   delete array_data [i];
-               delete array_data;
-               array_data = NULL;
-           }
-       }
+        {
+            if (array_data) {
+                for (unsigned int i = 0; i < m_nx; i++)
+                    delete array_data [i];
+                delete array_data;
+                array_data = NULL;
+            }
+        }
 
 
     Array2d& operator= (const Array2d& rhs); //assignment operator