r90: Convert MPI structure to C++ class

[ctsim.git] / src / if-1.cpp

diff --git a/src/if-1.cpp b/src/if-1.cpp
index b28ac181baad166d2cbf481ff4cc072d59694fa5..bfdd9ddfd65bc9304fa0490894f7e883269773fa 100644 (file)
--- a/src/if-1.cpp
+++ b/src/if-1.cpp
@@ -1,34 +1,15 @@
 /*****************************************************************************
-**  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
-**
-**  $Id: if-1.cpp,v 1.2 2000/06/07 03:50:27 kevin Exp $
-**  $Log: if-1.cpp,v $
-**  Revision 1.2  2000/06/07 03:50:27  kevin
-**  *** empty log message ***
-**
-**  Revision 1.1  2000/06/07 02:29:05  kevin
-**  Initial C++ versions
-**
-**  Revision 1.6  2000/05/24 22:50:04  kevin
-**  Added support for new SGP library
-**
-**  Revision 1.5  2000/05/16 04:33:59  kevin
-**  Improved option processing
+** FILE IDENTIFICATION
 **
-**  Revision 1.4  2000/05/09 14:52:27  kevin
-**  added sqr and sqrt functions
-**
-**  Revision 1.3  2000/05/08 20:02:32  kevin
-**  ANSI C changes
-**
-**  Revision 1.2  2000/05/03 08:49:50  kevin
-**  Code cleanup
-**
-**  Revision 1.1.1.1  2000/04/28 13:02:44  kevin
-**  Initial CVS import for first public release
+**   Name:          if-1.cpp
+**   Purpose:       Manipulate a single image file
+**   Programmer:    Kevin Rosenberg
+**   Date Started:  Aug 1984
 **
+**  This is part of the CTSim program
+**  Copyright (C) 1983-2000 Kevin Rosenberg
 **
+**  $Id: if-1.cpp,v 1.4 2000/06/08 16:43: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
@@ -156,13 +137,13 @@ if1_main (int argc, char *const argv[])
 
     im_in = new ImageFile (in_file);
     im_in->adf.fileRead ();
-    int nx = im_in->adf.nx();
-    int ny = im_in->adf.ny();
+    int nx = im_in->nx();
+    int ny = im_in->ny();
     im_out = new ImageFile (out_file, nx, ny);
     im_out->adf.fileCreate ();
 
-    ImageFileArray vIn = im_in->adf.getArray();
-    ImageFileArray vOut = im_out->adf.getArray();
+    ImageFileArray vIn = im_in->getArray();
+    ImageFileArray vOut = im_out->getArray();
 
     if (opt_invert) {
       for (ix = 0; ix < nx; ix++)
@@ -196,11 +177,7 @@ if1_main (int argc, char *const argv[])
     }
 
     im_out->adf.arrayDataWrite ();
-    for (int i = 0; i < im_in->adf.getNumLabels(); i++) {
-      Array2dFileLabel l;
-      im_in->adf.labelRead (l, i);
-      im_out->adf.labelAdd (l);
-    }
+    im_out->adf.labelsCopy (im_in->adf);
     im_out->adf.labelAdd (Array2dFileLabel::L_HISTORY, histString.c_str());
     im_out->adf.fileClose ();
   }