projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r204: *** empty log message ***
[ctsim.git]
/
libctsim
/
array2dfile.cpp
diff --git
a/libctsim/array2dfile.cpp
b/libctsim/array2dfile.cpp
index 03a5f1afdf0424fb3b66584ba1d808e3f5aad6f0..424ec230fe8d1717550ee6a9b1e402abe0bf1e3d 100644
(file)
--- a/
libctsim/array2dfile.cpp
+++ b/
libctsim/array2dfile.cpp
@@
-9,7
+9,7
@@
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: array2dfile.cpp,v 1.
4 2000/06/29 12:39:46
kevin Exp $
+** $Id: array2dfile.cpp,v 1.
8 2000/07/29 19:50:08
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
@@
-107,7
+107,7
@@
const string&
Array2dFileLabel::getDateString (void) const
{
ostringstream oss;
Array2dFileLabel::getDateString (void) const
{
ostringstream oss;
- oss <<
m_month + 1 <<"/"<< m_day <<"/"<< m_year + 1900 << " " << m_hour <<":"<< m_minute <<":"<< m_second
;
+ oss <<
static_cast<int>(m_month + 1) <<"/"<< static_cast<int>(m_day) <<"/"<< static_cast<int>(m_year + 1900) << " " << static_cast<int>(m_hour) <<":"<< static_cast<int>(m_minute) <<":"<< static_cast<int>(m_second)
;
m_strDate = oss.str();
return m_strDate;
}
m_strDate = oss.str();
return m_strDate;
}
@@
-170,7
+170,7
@@
Array2dFile::~Array2dFile (void)
{
freeArray ();
for (labelIterator l = m_labels.begin(); l != m_labels.end(); l++)
{
freeArray ();
for (labelIterator l = m_labels.begin(); l != m_labels.end(); l++)
-
delete *l;
+ delete *l;
}
Array2dFile::Array2dFile (void)
}
Array2dFile::Array2dFile (void)
@@
-199,12
+199,9
@@
Array2dFile::init (void)
void
Array2dFile::setArraySize (int x, int y, int pixelSize, int pixelFormat)
{
void
Array2dFile::setArraySize (int x, int y, int pixelSize, int pixelFormat)
{
- m_nx = x;
- m_ny = y;
m_pixelSize = pixelSize;
m_pixelSize = pixelSize;
- m_arraySize = m_nx * m_ny * m_pixelSize;
m_pixelFormat = pixelFormat;
m_pixelFormat = pixelFormat;
-
allocArray (
);
+
setArraySize (x, y
);
}
void
}
void
@@
-225,7
+222,7
@@
Array2dFile::allocArray (void)
m_arrayData = new unsigned char* [m_nx];
int columnBytes = m_ny * m_pixelSize;
m_arrayData = new unsigned char* [m_nx];
int columnBytes = m_ny * m_pixelSize;
- for (int i = 0; i < m_nx; i++)
+ for (
unsigned
int i = 0; i < m_nx; i++)
m_arrayData[i] = new unsigned char [columnBytes];
}
m_arrayData[i] = new unsigned char [columnBytes];
}
@@
-233,13
+230,19
@@
void
Array2dFile::freeArray (void)
{
if (m_arrayData) {
Array2dFile::freeArray (void)
{
if (m_arrayData) {
- for (int i = 0; i < m_nx; i++)
+ for (
unsigned
int i = 0; i < m_nx; i++)
delete m_arrayData[i];
delete m_arrayData;
m_arrayData = NULL;
}
}
delete m_arrayData[i];
delete m_arrayData;
m_arrayData = NULL;
}
}
+bool
+Array2dFile::fileWrite (const string& filename)
+{
+ return fileWrite (filename.c_str());
+}
+
bool
Array2dFile::fileWrite (const char* const filename)
{
bool
Array2dFile::fileWrite (const char* const filename)
{
@@
-262,6
+265,12
@@
Array2dFile::fileWrite (const char* const filename)
return true;
}
return true;
}
+bool
+Array2dFile::fileRead (const string& filename)
+{
+ return fileRead (filename.c_str());
+}
+
bool
Array2dFile::fileRead (const char* const filename)
{
bool
Array2dFile::fileRead (const char* const filename)
{
@@
-427,7
+436,7
@@
Array2dFile::arrayDataRead (frnetorderstream& fs)
fs.seekg (m_headersize);
int columnSize = m_ny * m_pixelSize;
fs.seekg (m_headersize);
int columnSize = m_ny * m_pixelSize;
- for (int ix = 0; ix < m_nx; ix++) {
+ for (
unsigned
int ix = 0; ix < m_nx; ix++) {
unsigned char* ptrColumn = m_arrayData[ix];
if (NativeBigEndian()) {
for (unsigned int iy = 0; iy < m_ny; iy++) {
unsigned char* ptrColumn = m_arrayData[ix];
if (NativeBigEndian()) {
for (unsigned int iy = 0; iy < m_ny; iy++) {
@@
-539,7
+548,7
@@
void
Array2dFile::labelsCopy (Array2dFile& copyFile, const char* const idStr)
{
string id = idStr;
Array2dFile::labelsCopy (Array2dFile& copyFile, const char* const idStr)
{
string id = idStr;
- for (int i = 0; i < copyFile.getNumLabels(); i++) {
+ for (
unsigned
int i = 0; i < copyFile.getNumLabels(); i++) {
Array2dFileLabel l (copyFile.labelGet (i));
string lstr = l.getLabelString();
lstr = idStr + lstr;
Array2dFileLabel l (copyFile.labelGet (i));
string lstr = l.getLabelString();
lstr = idStr + lstr;
@@
-553,7
+562,7
@@
Array2dFile::arrayDataClear (void)
{
if (m_arrayData) {
int columnSize = m_ny * m_pixelSize;
{
if (m_arrayData) {
int columnSize = m_ny * m_pixelSize;
- for (int ix = 0; ix < m_nx; ix++)
+ for (
unsigned
int ix = 0; ix < m_nx; ix++)
memset (m_arrayData[ix], 0, columnSize);
}
}
memset (m_arrayData[ix], 0, columnSize);
}
}
@@
-561,8
+570,6
@@
Array2dFile::arrayDataClear (void)
void
Array2dFile::printLabels (ostream& os) const
{
void
Array2dFile::printLabels (ostream& os) const
{
- int nlabels = getNumLabels();
-
for (constLabelIterator l = m_labels.begin(); l != m_labels.end(); l++) {
const Array2dFileLabel& label = **l;
for (constLabelIterator l = m_labels.begin(); l != m_labels.end(); l++) {
const Array2dFileLabel& label = **l;