X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=tools%2Fif-1.cpp;h=8ed8ecf30df5c58bf35daa68e0dd6827de4b55d0;hp=d23cf89c92bcaeefec883d7cd35b568e568bdfb7;hb=855f0990a75750c61badd376ff35ffb39fab1c36;hpb=a35f9818445c3d30109ebf7d68422ca81d02aaf9

diff --git a/tools/if-1.cpp b/tools/if-1.cpp
index d23cf89..8ed8ecf 100644
--- a/tools/if-1.cpp
+++ b/tools/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.2 2000/08/02 18:09:11 kevin Exp $
+**  $Id: if-1.cpp,v 1.5 2000/12/17 23:30:48 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
@@ -46,22 +46,22 @@ static struct option my_options[] =
   {0, 0, 0, 0}
 };
 
-static const char* g_szIdStr = "$id$";
+static const char* g_szIdStr = "$Id: if-1.cpp,v 1.5 2000/12/17 23:30:48 kevin Exp $";
 
 void 
 if1_usage (const char *program)
 {
-  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;
+  std::cout << "usage: " << fileBasename(program) << " infile outfile [OPTIONS]" << std::endl;
+  std::cout << "Generate a IF file from a IF file" << std::endl;
+  std::cout << std::endl;
+  std::cout << "     --invert   Invert image" << std::endl;
+  std::cout << "     --log      Natural logrithm of image" << std::endl;
+  std::cout << "     --exp      Natural exponential of image" << std::endl;
+  std::cout << "     --sqr      Square of image" << std::endl;
+  std::cout << "     --sqrt     Square root of image" << std::endl;
+  std::cout << "     --verbose  Verbose modem" << std::endl;
+  std::cout << "     --version  Print version" << std::endl;
+  std::cout << "     --help     Print this help message" << std::endl;
 }
 
 int 
@@ -107,9 +107,9 @@ if1_main (int argc, char *const argv[])
 	  break;
         case O_VERSION:
 #ifdef VERSION
-	  cout << "Version " <<  VERSION << endl;
+	  std::cout << "Version " << VERSION << std::endl << g_szIdStr << std::endl;
 #else
-          cout << "Unknown version number" << endl;
+          std::cout << "Unknown version number" << std::endl;
 #endif
 	  return (0);
 	case O_HELP:
@@ -132,7 +132,7 @@ if1_main (int argc, char *const argv[])
   out_file = argv[optind + 1];
 
 
-  string histString;
+  std::string histString;
 
   if (opt_invert || opt_log || opt_exp || opt_sqr || opt_sqrt) {
     int ix, iy;
@@ -194,9 +194,9 @@ main (int argc, char *const argv[])
   try {
     retval = if1_main(argc, argv);
   } catch (exception e) {
-    cerr << "Exception: " << e.what() << endl;
+    std::cerr << "Exception: " << e.what() << std::endl;
   } catch (...) {
-    cerr << "Unknown exception" << endl;
+    std::cerr << "Unknown exception" << std::endl;
   }
 
   return (retval);