X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=libctsim%2Farray2dfile.cpp;h=121f3c862a3bcad3b1940c07ef7303ad168591b4;hb=2debde82a721c0cf5bdf6642ace3290f83bb21a4;hp=d260320412f5c44bf1e280aa1b7d5e9c73d8e4f8;hpb=3e346e67f7f7a331919a32439b0f54a4d53d3029;p=ctsim.git diff --git a/libctsim/array2dfile.cpp b/libctsim/array2dfile.cpp index d260320..121f3c8 100644 --- 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 ** -** $Id: array2dfile.cpp,v 1.3 2000/06/28 15:25:34 kevin Exp $ +** $Id: array2dfile.cpp,v 1.12 2000/12/04 03:42:00 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 @@ -27,10 +27,13 @@ #include "array2dfile.h" #include +#ifndef WIN32 #include +#endif using namespace std; +const kuint16 Array2dFile::m_signature = ('I'*256+'F'); /////////////////////////////////////////////////////////////////////////// // CLASS IMPLEMENTATION @@ -59,7 +62,7 @@ Array2dFileLabel::Array2dFileLabel() init(); } -Array2dFileLabel::Array2dFileLabel(const char* const str, double ctime = 0.) +Array2dFileLabel::Array2dFileLabel(const char* const str, double ctime) : m_strLabel (str) { init(); @@ -68,7 +71,7 @@ Array2dFileLabel::Array2dFileLabel(const char* const str, double ctime = 0.) m_calcTime = ctime; } -Array2dFileLabel::Array2dFileLabel(const int type, const char* const str, double ctime = 0.) +Array2dFileLabel::Array2dFileLabel(const int type, const char* const str, double ctime) : m_strLabel (str) { init(); @@ -107,7 +110,7 @@ const string& Array2dFileLabel::getDateString (void) const { ostringstream oss; - oss << m_month + 1 <<"/"<< m_day <<"/"<< m_year + 1900 << " " << m_hour <<":"<< m_minute <<":"<< m_second; + oss << static_cast(m_month + 1) <<"/"<< static_cast(m_day) <<"/"<< static_cast(m_year + 1900) << " " << static_cast(m_hour) <<":"<< static_cast(m_minute) <<":"<< static_cast(m_second); m_strDate = oss.str(); return m_strDate; } @@ -170,7 +173,7 @@ Array2dFile::~Array2dFile (void) { freeArray (); for (labelIterator l = m_labels.begin(); l != m_labels.end(); l++) - delete *l; + delete *l; } Array2dFile::Array2dFile (void) @@ -199,12 +202,9 @@ Array2dFile::init (void) void Array2dFile::setArraySize (int x, int y, int pixelSize, int pixelFormat) { - m_nx = x; - m_ny = y; m_pixelSize = pixelSize; - m_arraySize = m_nx * m_ny * m_pixelSize; m_pixelFormat = pixelFormat; - allocArray (); + setArraySize (x, y); } void @@ -225,7 +225,7 @@ Array2dFile::allocArray (void) 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]; } @@ -233,13 +233,19 @@ void 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; } } +bool +Array2dFile::fileWrite (const string& filename) +{ + return fileWrite (filename.c_str()); +} + bool Array2dFile::fileWrite (const char* const filename) { @@ -262,6 +268,12 @@ Array2dFile::fileWrite (const char* const filename) return true; } +bool +Array2dFile::fileRead (const string& filename) +{ + return fileRead (filename.c_str()); +} + bool Array2dFile::fileRead (const char* const filename) { @@ -403,11 +415,11 @@ Array2dFile::arrayDataWrite (frnetorderstream& fs) if (NativeBigEndian()) { for (unsigned int iy = 0; iy < m_ny; iy++) { ConvertReverseNetworkOrder (ptrColumn, m_pixelSize); - fs.write (ptrColumn, m_pixelSize); + fs.write (reinterpret_cast(ptrColumn), m_pixelSize); ptrColumn += m_pixelSize; } } else - fs.write (ptrColumn, columnSize); + fs.write (reinterpret_cast(ptrColumn), columnSize); } return true; @@ -427,16 +439,16 @@ Array2dFile::arrayDataRead (frnetorderstream& fs) 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++) { - fs.read (ptrColumn, m_pixelSize); + fs.read (reinterpret_cast(ptrColumn), m_pixelSize); ConvertReverseNetworkOrder (ptrColumn, m_pixelSize); ptrColumn += m_pixelSize; } } else - fs.read (ptrColumn, columnSize); + fs.read (reinterpret_cast(ptrColumn), columnSize); } return true; @@ -512,14 +524,14 @@ Array2dFile::labelsWrite (frnetorderstream& fs) } void -Array2dFile::labelAdd (const char* const lstr, double calc_time=0.) +Array2dFile::labelAdd (const char* const lstr, double calc_time) { labelAdd (Array2dFileLabel::L_HISTORY, lstr, calc_time); } void -Array2dFile::labelAdd (int type, const char* const lstr, double calc_time=0.) +Array2dFile::labelAdd (int type, const char* const lstr, double calc_time) { Array2dFileLabel label (type, lstr, calc_time); @@ -539,10 +551,8 @@ void Array2dFile::labelsCopy (Array2dFile& copyFile, const char* const idStr) { string id = idStr; - for (int i = 0; i < copyFile.getNumLabels(); i++) { - Array2dFileLabel l = copyFile.labelGet (i); - copyFile.labelGet(i).print(cout); - l.print(cout); + for (unsigned int i = 0; i < copyFile.getNumLabels(); i++) { + Array2dFileLabel l (copyFile.labelGet (i)); string lstr = l.getLabelString(); lstr = idStr + lstr; l.setLabelString (lstr); @@ -555,7 +565,7 @@ Array2dFile::arrayDataClear (void) { 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); } } @@ -563,8 +573,6 @@ Array2dFile::arrayDataClear (void) void Array2dFile::printLabels (ostream& os) const { - int nlabels = getNumLabels(); - for (constLabelIterator l = m_labels.begin(); l != m_labels.end(); l++) { const Array2dFileLabel& label = **l;