r94: finished c++ conversions

[ctsim.git] / src / ifinfo.cpp

diff --git a/src/ifinfo.cpp b/src/ifinfo.cpp
index bc55c1ec7f464ba1fc03ea077cd7be4e95293bc2..7c771f75d9fd2f85a944c7282fdbe33614a040e3 100644 (file)
--- a/src/ifinfo.cpp
+++ b/src/ifinfo.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ifinfo.cpp,v 1.4 2000/06/08 16:43:10 kevin Exp $
+**  $Id: ifinfo.cpp,v 1.6 2000/06/13 16:20:31 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 
 ifinfo_usage (const char *program)
 {
-  fprintf(stdout, "usage: %s infile [OPTIONS]\n", kbasename(program));
+  fprintf(stdout, "usage: %s infile [OPTIONS]\n", fileBasename(program));
   fprintf(stdout, "Imagefile information\n");
   fprintf(stdout, "\n");
   fprintf(stdout, "     infile       Name of input SDF file\n");
@@ -127,20 +127,20 @@ ifinfo_main (int argc, char *const argv[])
   in_file = argv[optind];
 
   im = new ImageFile (in_file);
-  if (! im->adf.fileRead ()) {
+  if (! im->fileRead ()) {
     sys_error (ERR_WARNING, "Unable to read file %s", in_file);
     return (1);
   }
 
   if (opt_labels) 
     {
-      int nlabels = im->adf.getNumLabels();
+      int nlabels = im->getNumLabels();
       int i;
 
       for (i = 0; i < nlabels; i++)
        {
            Array2dFileLabel label;
-           im->adf.labelRead (label, i);
+           im->labelRead (label, i);
 
            string str;
            label.getDateString (str);