r140: *** empty log message ***

[ctsim.git] / libctsim / array2dfile.cpp

diff --git a/libctsim/array2dfile.cpp b/libctsim/array2dfile.cpp
index d260320412f5c44bf1e280aa1b7d5e9c73d8e4f8..0ed6354454b0a2386cbd9142fd9e64a6834c3968 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
 **
-**  $Id: array2dfile.cpp,v 1.3 2000/06/28 15:25:34 kevin Exp $
+**  $Id: array2dfile.cpp,v 1.5 2000/07/09 08:16:17 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
@@ -240,6 +240,12 @@ Array2dFile::freeArray (void)
     }
 }
 
+bool
+Array2dFile::fileWrite (const string& filename)
+{
+  return fileWrite (filename.c_str());
+}
+
 bool
 Array2dFile::fileWrite (const char* const filename)
 {
@@ -262,6 +268,12 @@ Array2dFile::fileWrite (const char* const filename)
     return true;
 }
 
+bool
+Array2dFile::fileRead (const string& filename)
+{
+  return fileRead (filename.c_str());
+}
+
 bool
 Array2dFile::fileRead (const char* const filename)
 {
@@ -540,9 +552,7 @@ Array2dFile::labelsCopy (Array2dFile& copyFile, const char* const idStr)
 {
     string id = idStr;
     for (int i = 0; i < copyFile.getNumLabels(); i++) {
-      Array2dFileLabel l = copyFile.labelGet (i);
-      copyFile.labelGet(i).print(cout);
-      l.print(cout);
+      Array2dFileLabel l (copyFile.labelGet (i));
       string lstr = l.getLabelString();
       lstr = idStr + lstr;
       l.setLabelString (lstr);