r250: *** empty log message ***

diff --git a/libctsim/array2dfile.cpp b/libctsim/array2dfile.cpp
index e35a14982056cbb5f414b8fb73402ebe58a1c4a8..36adfbaa0017fb1447322e1a32bcbfbf2c773ce1 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
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: array2dfile.cpp,v 1.16 2000/12/06 15:17:51 kevin Exp $
+**  $Id: array2dfile.cpp,v 1.17 2000/12/14 20:59:30 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
 **
 **  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


@@ -555,9 +555,11 @@ Array2dFile::labelAdd (const Array2dFileLabel& label)
 }
 
 void
 }
 
 void

-Array2dFile::labelsCopy (Array2dFile& copyFile, const char* const idStr)
+Array2dFile::labelsCopy (Array2dFile& copyFile, const char* const pszId)

 {
 {

-    string id = idStr;
+    string id;
+    if (idStr)
+      id = pszId;

     for (unsigned int i = 0; i < copyFile.getNumLabels(); i++) {
       Array2dFileLabel l (copyFile.labelGet (i));
       string lstr = l.getLabelString();
     for (unsigned int i = 0; i < copyFile.getNumLabels(); i++) {
       Array2dFileLabel l (copyFile.labelGet (i));
       string lstr = l.getLabelString();