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

diff --git a/include/array2d.h b/include/array2d.h
index c4d4200..d9081db 100644
--- a/include/array2d.h
+++ b/include/array2d.h
@@ -7,16 +7,9 @@
 **	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,19 +28,20 @@
 #ifndef ARRAY2D_H
 #define ARRAY2D_H
 
-#include <kstddef.h>
+#include "ctsupport.h"
+
 
 template<class T> 
 class Array2d {
  public:
     Array2d (unsigned int x, unsigned int y)
-	: nx(x), ny(y), array_data(0)
+	: 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 ()
@@ -57,13 +51,13 @@ class Array2d {
     
     void initSetSize (unsigned int x, unsigned int y)
 	{
-	    nx = x;
-	    ny = y;
+	    m_nx = x;
+	    m_ny = y;
 	    deleteArray();
 	    allocArray();
 	}
 
-    T** getArray (void) const
+    T** getArray () const
 	{ return array_data; }
 
     T* getColumn (unsigned int x) const
@@ -72,40 +66,44 @@ class Array2d {
     T getPoint (unsigned int x, unsigned int y) const
 	{ return (array_data ? array_data[x][y] : NULL); }
 
-    unsigned int sizeofPixel (void) const 
+    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)
+    void allocArray ()
 	{
-	    array_data = new T*[nx];
+	    if (array_data)
+		deleteArray();
+
+	    array_data = new T*[m_nx];
 	    
-	    for (unsigned int i = 0; i < nx; i++)
-		array_data[i] = new T[ny];
+	    for (unsigned int i = 0; i < m_nx; i++)
+		array_data[i] = new T[m_ny];
 	}
 
-    void deleteArray (void)
+    void deleteArray ()
 	{
 	    if (array_data) {
-		for (int i = 0; i < nx; i++)
-		    delete array_data[i];
+		for (unsigned int i = 0; i < m_nx; i++)
+		    delete array_data [i];
 		delete array_data;
+		array_data = NULL;
 	    }
 	}
 
 
-    Array2d& operator= (const Array2d& rhs);
+    Array2d& operator= (const Array2d& rhs); //assignment operator
     Array2d (const Array2d& rhs);  // copy constructor
 };