X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tools%2Fpjinfo.cpp;h=d5086b9bfe5601f9e01b7c6b7365b3288b6510cb;hb=92a0f68cb5d5062787b0cbb2664fafe2b2c9ae37;hp=8a4d0e24b36a12a6bc3a7c6475ccbeb90e7473a9;hpb=9703ace3c451ce079967284bf191783736dbc77f;p=ctsim.git

diff --git a/tools/pjinfo.cpp b/tools/pjinfo.cpp
index 8a4d0e2..d5086b9 100644
--- a/tools/pjinfo.cpp
+++ b/tools/pjinfo.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: pjinfo.cpp,v 1.2 2000/12/16 02:31:00 kevin Exp $
+**  $Id: pjinfo.cpp,v 1.4 2000/12/17 22:30:34 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
@@ -50,21 +50,21 @@ static struct option my_options[] =
   {0, 0, 0, 0}
 };
 
-static const char* g_szIdStr = "$Id: pjinfo.cpp,v 1.2 2000/12/16 02:31:00 kevin Exp $";
+static const char* g_szIdStr = "$Id: pjinfo.cpp,v 1.4 2000/12/17 22:30:34 kevin Exp $";
 
 void 
 pjinfo_usage (const char *program)
 {
-  cout << "usage: " << fileBasename(program) << " proj-file [OPTIONS]" << endl;
-  cout << "Display projection file information" << endl;
-  cout << "\n";
-  cout << "   --binaryheader  Dump binary header data\n";
-  cout << "   --binaryviews   Dump binary view data\n";
-  cout << "   --startview n   Beginning view number to display (default=0)\n";
-  cout << "   --endview n     Ending view number to display (default=last view)\n";
-  cout << "   --dump          Print all scan data ASCII format\n";
-  cout << "   --version       Print version" << endl;
-  cout << "   --help          Print this help message" << endl;
+  std::cout << "usage: " << fileBasename(program) << " proj-file [OPTIONS]\n";
+  std::cout << "Display projection file information\n";
+  std::cout << "\n";
+  std::cout << "   --binaryheader  Dump binary header data\n";
+  std::cout << "   --binaryviews   Dump binary view data\n";
+  std::cout << "   --startview n   Beginning view number to display (default=0)\n";
+  std::cout << "   --endview n     Ending view number to display (default=last view)\n";
+  std::cout << "   --dump          Print all scan data ASCII format\n";
+  std::cout << "   --version       Print version\n";
+  std::cout << "   --help          Print this help message\n";
 }
 
 	  
@@ -72,7 +72,7 @@ pjinfo_usage (const char *program)
 int 
 pjinfo_main (const int argc, char *const argv[])
 {
-  string pj_name;
+  std::string pj_name;
   bool optDump = false;
   bool optBinaryHeader = false;
   bool optBinaryViews = false;
@@ -102,7 +102,7 @@ pjinfo_main (const int argc, char *const argv[])
 	  optStartView = strtol(optarg, &endptr, 10);
 	  endstr = optarg + strlen(optarg);
 	  if (endptr != endstr) {
-	    cerr << "Error setting --startview to %s" << optarg << endl;
+		  std::cerr << "Error setting --startview to %s" << optarg << std::endl;
 	    pjinfo_usage(argv[0]);
 	    return (1);
 	  }
@@ -111,16 +111,16 @@ pjinfo_main (const int argc, char *const argv[])
 	  optEndView = strtol(optarg, &endptr, 10);
 	  endstr = optarg + strlen(optarg);
 	  if (endptr != endstr) {
-	    cerr << "Error setting --endview to %s" << optarg << endl;
+		  std::cerr << "Error setting --endview to %s" << optarg << std::endl;
 	    pjinfo_usage(argv[0]);
 	    return (1);
 	  }
 	  break;
         case O_VERSION:
 #ifdef VERSION
-	  cout << "Version " << VERSION << endl << g_szIdStr << endl;
+	  std::cout << "Version " << VERSION << std::endl << g_szIdStr << std::endl;
 #else
-          cout << "Unknown version number" << endl;
+          std::cout << "Unknown version number\n";
 #endif
 	  return (0);
 	case O_HELP:
@@ -141,9 +141,9 @@ pjinfo_main (const int argc, char *const argv[])
   pj_name = argv[optind];
 
   if (optBinaryHeader)
-    Projections::copyHeader (pj_name, cout);
+    Projections::copyHeader (pj_name, std::cout);
   else if (optBinaryViews)
-    Projections::copyViewData (pj_name, cout, optStartView, optEndView);
+    Projections::copyViewData (pj_name, std::cout, optStartView, optEndView);
   else {
     Projections pj;
     if (! pj.read (pj_name)) {
@@ -154,9 +154,9 @@ pjinfo_main (const int argc, char *const argv[])
     if (optDump) {
       pj.printProjectionData (optStartView, optEndView);
     } else {
-      ostringstream os;
+      std::ostringstream os;
       pj.printScanInfo (os);
-      cout << os.str();
+      std::cout << os.str();
     }
   }
   
@@ -173,9 +173,9 @@ main (const int argc, char *const argv[])
   try {
     retval = pjinfo_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\n";
   }
 
   return (retval);