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

diff --git a/libctsim/array2dfile.cpp b/libctsim/array2dfile.cpp
index 2999470..b16c7d3 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.14 2000/12/04 19:50:57 kevin Exp $
+**  $Id: array2dfile.cpp,v 1.15 2000/12/06 01:46:43 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
@@ -392,7 +392,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);
   
@@ -480,12 +480,12 @@ Array2dFile::labelsRead (frnetorderstream& fs)
 	
 	kuint16 strLength;
 	fs.readInt16 (strLength);
-	char* labelStr = new char [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);
-	delete labelStr;
+	Array2dFileLabel* pLabel = new Array2dFileLabel (labelType, pszLabelStr, calcTime);
+	delete pszLabelStr;
 
 	pLabel->setDateTime (year, month, day, hour, minute, second);
 	m_labels.push_back (pLabel);