projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r246: More modifications for MSVC
[ctsim.git]
/
libctsim
/
array2dfile.cpp
diff --git
a/libctsim/array2dfile.cpp
b/libctsim/array2dfile.cpp
index f0f19ab5d13c12d08a59b908580c243d5b7298f3..b16c7d3b7810db59fd734e8cca62c24fe73e1201 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.
7 2000/07/23 01:49:0
3 kevin Exp $
+** $Id: array2dfile.cpp,v 1.
15 2000/12/06 01:46:4
3 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
@@
-29,8
+29,10
@@
#include <ctime>
#include <sstream>
#include <ctime>
#include <sstream>
+
using namespace std;
using namespace std;
+const kuint16 Array2dFile::m_signature = ('I'*256+'F');
///////////////////////////////////////////////////////////////////////////
// CLASS IMPLEMENTATION
///////////////////////////////////////////////////////////////////////////
// CLASS IMPLEMENTATION
@@
-59,7
+61,7
@@
Array2dFileLabel::Array2dFileLabel()
init();
}
init();
}
-Array2dFileLabel::Array2dFileLabel(const char* const str, double ctime
= 0.
)
+Array2dFileLabel::Array2dFileLabel(const char* const str, double ctime)
: m_strLabel (str)
{
init();
: m_strLabel (str)
{
init();
@@
-68,7
+70,7
@@
Array2dFileLabel::Array2dFileLabel(const char* const str, double ctime = 0.)
m_calcTime = ctime;
}
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();
: m_strLabel (str)
{
init();
@@
-199,12
+201,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
@@
-279,7
+278,11
@@
Array2dFile::fileRead (const char* const filename)
{
m_filename = filename;
{
m_filename = filename;
- frnetorderstream fs (m_filename.c_str(), ios::out | ios::in | ios::binary | ios::nocreate);
+#ifdef MSVC
\r
+ frnetorderstream fs (m_filename.c_str(), ios::out | ios::in | ios::binary);
\r
+#else
\r
+ frnetorderstream fs (m_filename.c_str(), ios::out | ios::in | ios::binary | ios::nocreate);
\r
+#endif
\r
if (fs.fail()) {
sys_error (ERR_WARNING, "Unable to open file %s [fileRead]", m_filename.c_str());
return false;
if (fs.fail()) {
sys_error (ERR_WARNING, "Unable to open file %s [fileRead]", m_filename.c_str());
return false;
@@
-389,7
+392,7
@@
Array2dFile::headerWrite (frnetorderstream& fs)
fs.writeFloat64 (m_offsetPV);
fs.writeFloat64 (m_scalePV);
fs.writeFloat64 (m_offsetPV);
fs.writeFloat64 (m_scalePV);
- m_headersize =
fs.tellp(
);
+ m_headersize =
static_cast<kuint16>(fs.tellp()
);
fs.seekp (0);
fs.writeInt16 (m_headersize);
fs.seekp (0);
fs.writeInt16 (m_headersize);
@@
-415,11
+418,11
@@
Array2dFile::arrayDataWrite (frnetorderstream& fs)
if (NativeBigEndian()) {
for (unsigned int iy = 0; iy < m_ny; iy++) {
ConvertReverseNetworkOrder (ptrColumn, m_pixelSize);
if (NativeBigEndian()) {
for (unsigned int iy = 0; iy < m_ny; iy++) {
ConvertReverseNetworkOrder (ptrColumn, m_pixelSize);
- fs.write (
ptrColumn
, m_pixelSize);
+ fs.write (
reinterpret_cast<const char*>(ptrColumn)
, m_pixelSize);
ptrColumn += m_pixelSize;
}
} else
ptrColumn += m_pixelSize;
}
} else
- fs.write (
ptrColumn
, columnSize);
+ fs.write (
reinterpret_cast<const char*>(ptrColumn)
, columnSize);
}
return true;
}
return true;
@@
-443,12
+446,12
@@
Array2dFile::arrayDataRead (frnetorderstream& fs)
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++) {
- fs.read (
ptrColumn
, m_pixelSize);
+ fs.read (
reinterpret_cast<char*>(ptrColumn)
, m_pixelSize);
ConvertReverseNetworkOrder (ptrColumn, m_pixelSize);
ptrColumn += m_pixelSize;
}
} else
ConvertReverseNetworkOrder (ptrColumn, m_pixelSize);
ptrColumn += m_pixelSize;
}
} else
- fs.read (
ptrColumn
, columnSize);
+ fs.read (
reinterpret_cast<char*>(ptrColumn)
, columnSize);
}
return true;
}
return true;
@@
-477,13
+480,15
@@
Array2dFile::labelsRead (frnetorderstream& fs)
kuint16 strLength;
fs.readInt16 (strLength);
kuint16 strLength;
fs.readInt16 (strLength);
- char
labelSt
r [strLength+1];
- fs.read (
l
abelStr, strLength);
-
l
abelStr[strLength] = 0;
+ char
* pszLabelStr = new cha
r [strLength+1];
+ fs.read (
pszL
abelStr, strLength);
+
pszL
abelStr[strLength] = 0;
- Array2dFileLabel* pLabel = new Array2dFileLabel(labelType, labelStr, calcTime);
+ Array2dFileLabel* pLabel = new Array2dFileLabel (labelType, pszLabelStr, calcTime);
+ delete pszLabelStr;
\r
+
\r
pLabel->setDateTime (year, month, day, hour, minute, second);
pLabel->setDateTime (year, month, day, hour, minute, second);
- m_labels.push_back (pLabel);
+ m_labels.push_back (pLabel);
\r
}
return true;
}
return true;
@@
-524,14
+529,14
@@
Array2dFile::labelsWrite (frnetorderstream& fs)
}
void
}
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
{
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);
{
Array2dFileLabel label (type, lstr, calc_time);