X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsim%2Farray2dfile.cpp;h=e35a14982056cbb5f414b8fb73402ebe58a1c4a8;hp=f0f19ab5d13c12d08a59b908580c243d5b7298f3;hb=55426f4170ed9dc777c3cec3741e4a59e6eebd38;hpb=c4af77faf7f216b936f0782e918634d34980c63f

diff --git a/libctsim/array2dfile.cpp b/libctsim/array2dfile.cpp
index f0f19ab..e35a149 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.7 2000/07/23 01:49:03 kevin Exp $
+**  $Id: array2dfile.cpp,v 1.16 2000/12/06 15:17:51 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
@@ -26,11 +26,14 @@
 ******************************************************************************/
 
 #include "array2dfile.h"
-#include <ctime>
-#include <sstream>
+#include <ctime>
+#ifdef MSVC
+typedef long off_t;
+#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();
@@ -106,9 +109,10 @@ Array2dFileLabel::getDateTime (int& year, int& month, int& day, int& hour, int&
 const string& 
 Array2dFileLabel::getDateString (void) const
 {
-  ostringstream oss;
-  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();
+  char szDate [128];
+  snprintf (szDate, sizeof(szDate), "%2d/%02d/%4d %02d:%02d:%02d",
+	  m_month + 1, m_day, m_year + 1900, m_hour, m_minute, m_second);
+  m_strDate = szDate;
   return m_strDate;
 }
 
@@ -199,12 +203,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 +280,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;
@@ -389,7 +394,7 @@ Array2dFile::headerWrite (frnetorderstream& fs)
   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);
   
@@ -415,11 +420,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 +448,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 +482,15 @@ Array2dFile::labelsRead (frnetorderstream& fs)
 	
 	kuint16 strLength;
 	fs.readInt16 (strLength);
-	char labelStr [strLength+1];
-	fs.read (labelStr, strLength);
-	labelStr[strLength] = 0;
+	char* pszLabelStr = new char [strLength+1];
+	fs.read (pszLabelStr, strLength);
+	pszLabelStr[strLength] = 0;
 
-	Array2dFileLabel* pLabel = new Array2dFileLabel(labelType, labelStr, calcTime);
+	Array2dFileLabel* pLabel = new Array2dFileLabel (labelType, pszLabelStr, calcTime);
+	delete pszLabelStr;
+
 	pLabel->setDateTime (year, month, day, hour, minute, second);
-	m_labels.push_back (pLabel);
+	m_labels.push_back (pLabel);
     }
 
     return true;
@@ -524,14 +531,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);