X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fif-1.cpp;h=07359a0323c88e21e6c1f7dfa0ba1b9daf84134a;hp=bfdd9ddfd65bc9304fa0490894f7e883269773fa;hb=207332eec9416d299766abb697312cfd27eb890e;hpb=013445d4e52c07491291289eb32fa325d9f9f8ff

diff --git a/src/if-1.cpp b/src/if-1.cpp
index bfdd9dd..07359a0 100644
--- a/src/if-1.cpp
+++ b/src/if-1.cpp
@@ -9,7 +9,7 @@
 **  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 $
+**  $Id: if-1.cpp,v 1.8 2000/06/19 17:58:13 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,17 +49,17 @@ static struct option my_options[] =
 void 
 if1_usage (const char *program)
 {
-  fprintf(stdout, "if1_usage: %s infile outfile [OPTIONS]\n", kbasename(program));
-  fprintf(stdout, "Generate a IF file from a IF file\n");
-  fprintf(stdout, "\n");
-  fprintf(stdout, "     --invert   Invert image\n");
-  fprintf(stdout, "     --log      Natural logrithm of image\n");
-  fprintf(stdout, "     --exp      Natural exponential of image\n");
-  fprintf(stdout, "     --sqr      Square of image\n");
-  fprintf(stdout, "     --sqrt     Square root of image\n");
-  fprintf(stdout, "     --verbose  Verbose modem\n");
-  fprintf(stdout, "     --version  Print version\n");
-  fprintf(stdout, "     --help     Print this help message\n");
+  cout << "usage: " << fileBasename(program) << " infile outfile [OPTIONS]" << endl;
+  cout << "Generate a IF file from a IF file" << endl;
+  cout << endl;
+  cout << "     --invert   Invert image" << endl;
+  cout << "     --log      Natural logrithm of image" << endl;
+  cout << "     --exp      Natural exponential of image" << endl;
+  cout << "     --sqr      Square of image" << endl;
+  cout << "     --sqrt     Square root of image" << endl;
+  cout << "     --verbose  Verbose modem" << endl;
+  cout << "     --version  Print version" << endl;
+  cout << "     --help     Print this help message" << endl;
 }
 
 int 
@@ -105,11 +105,11 @@ if1_main (int argc, char *const argv[])
 	  break;
         case O_VERSION:
 #ifdef VERSION
-	  fprintf(stdout, "Version %s\n", VERSION);
+	  cout << "Version " <<  VERSION << endl;
 #else
-	  fprintf(stderr, "Unknown version number");
+          cout << "Unknown version number" << endl;
 #endif
-	  exit(0);
+	  return (0);
 	case O_HELP:
 	case '?':
 	  if1_usage(argv[0]);
@@ -136,11 +136,11 @@ if1_main (int argc, char *const argv[])
     int ix, iy;
 
     im_in = new ImageFile (in_file);
-    im_in->adf.fileRead ();
+    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->getArray();
     ImageFileArray vOut = im_out->getArray();
@@ -176,10 +176,10 @@ if1_main (int argc, char *const argv[])
       histString = "Sqrt transformation";
     }
 
-    im_out->adf.arrayDataWrite ();
-    im_out->adf.labelsCopy (im_in->adf);
-    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);
@@ -189,7 +189,17 @@ if1_main (int argc, char *const argv[])
 int 
 main (int argc, char *const argv[])
 {
-  return (if1_main(argc, argv));
+  int retval = 1;
+
+  try {
+    retval = if1_main(argc, argv);
+  } catch (exception e) {
+    cerr << "Exception: " << e.what() << endl;
+  } catch (...) {
+    cerr << "Unknown exception" << endl;
+  }
+
+  return (retval);
 }
 #endif