projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r2213: *** empty log message ***
[ctsim.git]
/
include
/
array2d.h
diff --git
a/include/array2d.h
b/include/array2d.h
index 9caca5c1bfc01a9e89e19275ecdf76a1b6282d70..6f2f5cd572af4cdac050afcd77a174b6bda735e7 100644
(file)
--- a/
include/array2d.h
+++ b/
include/array2d.h
@@
-7,9
+7,9
@@
** Date Started: June 2000
**
** This is part of the CTSim program
** Date Started: June 2000
**
** This is part of the CTSim program
-** Copyright (
C) 1983-2000
Kevin Rosenberg
+** Copyright (
c) 1983-2001
Kevin Rosenberg
**
**
-** $Id: array2d.h,v 1.
6 2000/06/26 21:15:24
kevin Exp $
+** $Id: array2d.h,v 1.
9 2001/01/28 19:10:18
kevin Exp $
**
** 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
**
** 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,13
+35,13
@@
template<class T>
class Array2d {
public:
Array2d (unsigned int x, unsigned int y)
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();
}
{
allocArray();
}
- Array2d (
void
)
- :
array_data(0), nx(0), ny
(0)
+ Array2d ()
+ :
m_nx(0), m_ny(0), array_data
(0)
{}
~Array2d ()
{}
~Array2d ()
@@
-51,13
+51,13
@@
class Array2d {
void initSetSize (unsigned int x, unsigned int y)
{
void initSetSize (unsigned int x, unsigned int y)
{
- nx = x;
- ny = y;
+
m_
nx = x;
+
m_
ny = y;
deleteArray();
allocArray();
}
deleteArray();
allocArray();
}
- T** getArray (
void
) const
+ T** getArray () const
{ return array_data; }
T* getColumn (unsigned int x) const
{ return array_data; }
T* getColumn (unsigned int x) const
@@
-66,35
+66,39
@@
class Array2d {
T getPoint (unsigned int x, unsigned int y) const
{ return (array_data ? array_data[x][y] : NULL); }
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); }
{ 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:
private:
- unsigned int nx;
- unsigned int ny;
+ unsigned int
m_
nx;
+ unsigned int
m_
ny;
T** array_data;
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) {
{
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;
delete array_data;
+ array_data = NULL;
}
}
}
}