X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Farray2d.h;h=a03ae586b79a0917e417f1ec13651095627f61c3;hp=c4d42007b50bdc38a08f1fb48d46ea94649ebc7a;hb=1a050c98763fbbc0662731b0b76953acede6f5d7;hpb=4b16507e92bb80b09575b28bed66810e33d2681f

diff --git a/include/array2d.h b/include/array2d.h
index c4d4200..a03ae58 100644
--- a/include/array2d.h
+++ b/include/array2d.h
@@ -1,22 +1,15 @@
 /*****************************************************************************
 ** 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-2000 Kevin Rosenberg
-**
-**  $Id: array2d.h,v 1.4 2000/06/09 11:03:08 kevin Exp $
-**  $Log: array2d.h,v $
-**  Revision 1.4  2000/06/09 11:03:08  kevin
-**  Made ImageFile inherit from Array2dFile
-**
-**  Revision 1.3  2000/06/09 01:35:33  kevin
-**  Convert MPI structure to C++ class
+**  Copyright (c) 1983-2001 Kevin Rosenberg
 **
+**  $Id$
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -35,77 +28,82 @@
 #ifndef ARRAY2D_H
 #define ARRAY2D_H
 
-#include <kstddef.h>
+#include "ctsupport.h"
+
 
-template<class T> 
+template<class T>
 class Array2d {
  public:
     Array2d (unsigned int x, unsigned int y)
-	: nx(x), ny(y), array_data(0)
-	{
-	    allocArray();
-	}
+        : m_nx(x), m_ny(y), array_data(0)
+        {
+            allocArray();
+        }
 
-    Array2d (void)
-	: array_data(0), nx(0), ny(0)
-	{}
+    Array2d ()
+        : m_nx(0), m_ny(0), array_data(0)
+        {}
 
     ~Array2d ()
-	{
-	    deleteArray();
-	}
-    
+        {
+            deleteArray();
+        }
+
     void initSetSize (unsigned int x, unsigned int y)
-	{
-	    nx = x;
-	    ny = y;
-	    deleteArray();
-	    allocArray();
-	}
+        {
+            m_nx = x;
+            m_ny = y;
+            deleteArray();
+            allocArray();
+        }
 
-    T** getArray (void) const
-	{ return array_data; }
+    T** getArray () const
+        { 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 (void) const 
-	{  return sizeof(T); }
+    unsigned int sizeofPixel () const
+        {  return sizeof(T); }
 
-    unsigned int sizeofColumn (void) const
-	{ return (sizeof(T) * ny); }
+    unsigned int sizeofColumn () const
+        { return (sizeof(T) * m_ny); }
 
-    unsigned int sizeofArray (void) const
-	{ return (sizeof(T) * nx * ny); }
+    unsigned int sizeofArray () const
+        { return (sizeof(T) * m_nx * m_ny); }
 
 
  private:
-    unsigned int nx;
-    unsigned int ny;
+    unsigned int m_nx;
+    unsigned int m_ny;
     T** array_data;
 
-    void allocArray (void)
-	{
-	    array_data = new T*[nx];
-	    
-	    for (unsigned int i = 0; i < nx; i++)
-		array_data[i] = new T[ny];
-	}
-
-    void deleteArray (void)
-	{
-	    if (array_data) {
-		for (int i = 0; i < nx; i++)
-		    delete array_data[i];
-		delete array_data;
-	    }
-	}
-
-
-    Array2d& operator= (const Array2d& rhs);
+    void allocArray ()
+        {
+            if (array_data)
+                deleteArray();
+
+            array_data = new T*[m_nx];
+
+            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;
+            }
+        }
+
+
+    Array2d& operator= (const Array2d& rhs); //assignment operator
     Array2d (const Array2d& rhs);  // copy constructor
 };