X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=libctsim%2Farray2dfile.cpp;h=2999470e871e85af572312a63f941e796ab9ae0a;hb=806adf54f5b8d061662696b3b498bfab3cd8b2e6;hp=ed04a7c04f3ee149dc6a7266a885eaa4b96be7c7;hpb=3fba6928127cd65870bdcd96c8114ad5894247ae;p=ctsim.git

diff --git a/libctsim/array2dfile.cpp b/libctsim/array2dfile.cpp
index ed04a7c..2999470 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.6 2000/07/13 07:03:21 kevin Exp $
+**  $Id: array2dfile.cpp,v 1.14 2000/12/04 19:50:57 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
@@ -29,8 +29,10 @@
 #include <ctime>
 #include <sstream>
 
+
 using namespace std;
 
+const kuint16 Array2dFile::m_signature = ('I'*256+'F');
 
 ///////////////////////////////////////////////////////////////////////////
 // CLASS IMPLEMENTATION
@@ -59,7 +61,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 +70,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();
@@ -170,7 +172,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 +201,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
@@ -279,7 +278,11 @@ Array2dFile::fileRead (const char* const filename)
 {
     m_filename = filename;
 
-    frnetorderstream fs (m_filename.c_str(), ios::out | ios::in | ios::binary | ios::nocreate);
+#ifdef MSVC
+    frnetorderstream fs (m_filename.c_str(), ios::out | ios::in | ios::binary);
+#else
+    frnetorderstream fs (m_filename.c_str(), ios::out | ios::in | ios::binary | ios::nocreate);
+#endif
     if (fs.fail()) {
       sys_error (ERR_WARNING, "Unable to open file %s [fileRead]", m_filename.c_str());
       return false;
@@ -415,11 +418,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<const char*>(ptrColumn), m_pixelSize);
 	      ptrColumn += m_pixelSize;
 	  }
       } else 
-	  fs.write (ptrColumn, columnSize);
+	  fs.write (reinterpret_cast<const char*>(ptrColumn), columnSize);
   }
 
   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++) {
-	      fs.read (ptrColumn, m_pixelSize);
+	      fs.read (reinterpret_cast<char*>(ptrColumn), m_pixelSize);
 	      ConvertReverseNetworkOrder (ptrColumn, m_pixelSize);
 	      ptrColumn += m_pixelSize;
 	  } 
       } else
-	  fs.read (ptrColumn, columnSize);
+	  fs.read (reinterpret_cast<char*>(ptrColumn), columnSize);
   }
 
   return true;
@@ -477,13 +480,15 @@ Array2dFile::labelsRead (frnetorderstream& fs)
 	
 	kuint16 strLength;
 	fs.readInt16 (strLength);
-	char labelStr [strLength+1];
+	char* labelStr = new char [strLength+1];
 	fs.read (labelStr, strLength);
 	labelStr[strLength] = 0;
 
 	Array2dFileLabel* pLabel = new Array2dFileLabel(labelType, labelStr, calcTime);
+	delete labelStr;
+
 	pLabel->setDateTime (year, month, day, hour, minute, second);
-	m_labels.push_back (pLabel);
+	m_labels.push_back (pLabel);
     }
 
     return true;
@@ -524,14 +529,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);