r96: *** empty log message ***

[ctsim.git] / src / rs2if.cpp

diff --git a/src/rs2if.cpp b/src/rs2if.cpp
index 82ed201b6cc6a316d9bbaf8e23e13ef2c0999033..d82ee0997bd241447a825abea7788f77159fe2ac 100644 (file)
--- a/src/rs2if.cpp
+++ b/src/rs2if.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: rs2if.cpp,v 1.4 2000/06/09 11:03:08 kevin Exp $
+**  $Id: rs2if.cpp,v 1.6 2000/06/15 19:07:10 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
@@ -49,7 +49,7 @@ static struct option my_options[] =
 void 
 rs2if_usage (const char *program)
 {
-  fprintf(stdout, "usage: %s in-rs-file out-if-file [OPTIONS]\n", kbasename(program));
+  fprintf(stdout, "usage: %s in-rs-file out-if-file [OPTIONS]\n", fileBasename(program));
   fprintf(stdout, "This program converts a raysum file to a IF file\n");
   fprintf(stdout, "\n");
   fprintf(stdout, "   --verbose   Verbose mode\n");
@@ -117,7 +117,7 @@ rs2if_main (const int argc, char *const argv[])
     {
       printf ("Number of detectors: %d\n", rs->ndet);
       printf ("    Number of views: %d\n", rs->nview);
-      printf ("             Remark: %s\n", rs->remark);
+      printf ("             Remark: %s\n", rs->remark.c_str());
     }
   
   im = new ImageFile (im_name, rs->ndet, rs->nview);
@@ -138,7 +138,7 @@ rs2if_main (const int argc, char *const argv[])
 
   im->fileCreate ();
   im->arrayDataWrite ();
-  im->labelAdd (Array2dFileLabel::L_HISTORY, rs->remark, rs->calctime);
+  im->labelAdd (Array2dFileLabel::L_HISTORY, rs->remark.c_str(), rs->calctime);
   im->labelAdd (Array2dFileLabel::L_HISTORY, "Conversion from .rs to .idf");
   im->fileClose ();