X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fif-1.cpp;h=3150cf9e6044c9a94a8f09f5b4bb19915b17647e;hp=16e3b82ce46daac6dbf87f30d05a5769e4a89cab;hb=031437896d0dc6cac70c16e5604b10f5aa4d0767;hpb=f173363bba9997045e5ec825e64d6253ec4da235

diff --git a/src/if-1.cpp b/src/if-1.cpp
index 16e3b82..3150cf9 100644
--- a/src/if-1.cpp
+++ b/src/if-1.cpp
@@ -1,31 +1,15 @@
 /*****************************************************************************
-**  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
-**
-**  $Id: if-1.cpp,v 1.1 2000/06/07 02:29:05 kevin Exp $
-**  $Log: if-1.cpp,v $
-**  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
-**
-**  Revision 1.4  2000/05/09 14:52:27  kevin
-**  added sqr and sqrt functions
+** FILE IDENTIFICATION
 **
-**  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.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
@@ -65,7 +49,7 @@ static struct option my_options[] =
 void 
 if1_usage (const char *program)
 {
-  fprintf(stdout, "if1_usage: %s infile outfile [OPTIONS]\n", kbasename(program));
+  fprintf(stdout, "if1_usage: %s infile outfile [OPTIONS]\n", fileBasename(program));
   fprintf(stdout, "Generate a IF file from a IF file\n");
   fprintf(stdout, "\n");
   fprintf(stdout, "     --invert   Invert image\n");
@@ -152,14 +136,14 @@ if1_main (int argc, char *const argv[])
     int ix, iy;
 
     im_in = new ImageFile (in_file);
-    im_in->adf.fileRead ();
-    int nx = im_in->adf.nx;
-    int ny = im_in->adf.ny;
+    im_in->fileRead ();
+    int nx = im_in->nx();
+    int ny = im_in->ny();
     im_out = new ImageFile (out_file, nx, ny);
-    im_out->adf.fileCreate ();
+    im_out->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++)
@@ -192,14 +176,10 @@ if1_main (int argc, char *const argv[])
       histString = "Sqrt transformation";
     }
 
-    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.labelAdd (Array2dFileLabel::L_HISTORY, histString.c_str());
-    im_out->adf.fileClose ();
+    im_out->arrayDataWrite ();
+    im_out->labelsCopy (*im_in);
+    im_out->labelAdd (Array2dFileLabel::L_HISTORY, histString.c_str());
+    im_out->fileClose ();
   }
 
   return (0);