r91: Made ImageFile inherit from Array2dFile

[ctsim.git] / src / if2img.cpp

diff --git a/src/if2img.cpp b/src/if2img.cpp
index 1132e7383d649235168b53ba83f7183909a7f3d9..a99b8012e20b53dad885940c1e69fabbe35d4dcc 100644 (file)
--- a/src/if2img.cpp
+++ b/src/if2img.cpp
@@ -1,34 +1,15 @@
 /*****************************************************************************
-**  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
-**
-**  $Id: if2img.cpp,v 1.1 2000/06/07 07:55:30 kevin Exp $
-**  $Log: if2img.cpp,v $
-**  Revision 1.1  2000/06/07 07:55:30  kevin
-**  Initial import
-**
-**  Revision 1.1  2000/06/07 02:29:05  kevin
-**  Initial C++ versions
-**
-**  Revision 1.6  2000/06/03 07:57:51  kevin
-**  Fixed PNG 16-bit format
-**
-**  Revision 1.5  2000/06/03 06:29:57  kevin
-**  *** empty log message ***
+** FILE IDENTIFICATION
 **
-**  Revision 1.4  2000/05/24 22:50:04  kevin
-**  Added support for new SGP library
-**
-**  Revision 1.3  2000/05/16 04:33:59  kevin
-**  Improved option processing
-**
-**  Revision 1.2  2000/05/08 20:02:32  kevin
-**  ANSI C changes
-**
-**  Revision 1.1.1.1  2000/04/28 13:02:44  kevin
-**  Initial CVS import for first public release
+**   Name:          if2img.cpp
+**   Purpose:       Convert an image file to a viewable image
+**   Programmer:    Kevin Rosenberg
+**   Date Started:  April 2000
 **
+**  This is part of the CTSim program
+**  Copyright (C) 1983-2000 Kevin Rosenberg
 **
+**  $Id: if2img.cpp,v 1.3 2000/06/09 11:03:08 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
@@ -300,17 +281,17 @@ if2img_main (int argc, char *const argv[])
 
   pim = new ImageFile (in_file);
   ImageFile& im = *pim;
-  if (! im.adf.fileRead()) {
+  if (! im.fileRead()) {
     fprintf(stderr, "File %s does not exist\n", in_file);
     return (1);
   }
 
   if (opt_labels) {
-    int nlabels = im.adf.getNumLabels();
+    int nlabels = im.getNumLabels();
 
     for (int i = 0; i < nlabels; i++) {
       Array2dFileLabel label;
-      im.adf.labelRead (label, i);
+      im.labelRead (label, i);
       string str;
       label.getDateString (str);