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

diff --git a/libctsim/array2dfile.cpp b/libctsim/array2dfile.cpp
index f918471..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.13 2000/12/04 04:15:48 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,9 +26,10 @@
 ******************************************************************************/
 
 #include "array2dfile.h"
-#include <ctime>
-#include <sstream>
-
+#include <ctime>
+#ifdef MSVC
+typedef long off_t;
+#endif
 
 using namespace std;
 
@@ -108,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;
 }
 
@@ -278,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;
@@ -388,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);
   
@@ -476,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;