Update copyright date; remove old CVS keyword

[ctsim.git] / tools / pj2if.cpp

diff --git a/tools/pj2if.cpp b/tools/pj2if.cpp
index 9d194c4a48cf1c8a2c4cb367a7331f7405fd4f97..19eb14ddac7980223ebc5595108fd9210a4805dd 100644 (file)
--- a/tools/pj2if.cpp
+++ b/tools/pj2if.cpp
@@ -7,9 +7,7 @@
 **   Date Started:  April 2000
 **
 **  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
-**
-**  $Id: pj2if.cpp,v 1.9 2001/01/16 23:47:29 kevin Exp $
+**  Copyright (C) 1983-2009 Kevin Rosenberg
 **
 **  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
@@ -26,7 +24,7 @@
 ******************************************************************************/
 
 /* FILE
- *   pj2if.c                   Convert Raysum to image
+ *   pj2if.c                    Convert Raysum to image
  *
  * DATE
  *   Apr 1999
@@ -47,9 +45,9 @@ static struct option my_options[] =
   {0, 0, 0, 0}
 };
 
-static const char* g_szIdStr = "$Id: pj2if.cpp,v 1.9 2001/01/16 23:47:29 kevin Exp $";
+static const char* g_szIdStr = "$Id$";
 
-void 
+void
 pj2if_usage (const char *program)
 {
   std::cout << "usage: " << fileBasename(program) << " in-proj-file out-if-file [OPTIONS]\n";
@@ -61,7 +59,7 @@ pj2if_usage (const char *program)
   std::cout << "   --help      Print this help message\n";
 }
 
-int 
+int
 pj2if_main (const int argc, char *const argv[])
 {
   char *pj_name, *im_name;
@@ -73,30 +71,30 @@ pj2if_main (const int argc, char *const argv[])
     {
       int c = getopt_long (argc, argv, "", my_options, NULL);
       if (c == -1)
-       break;
-      
+        break;
+
       switch (c)
-       {
-       case O_VERBOSE:
-         optVerbose = true;
-         break;
+        {
+        case O_VERBOSE:
+          optVerbose = true;
+          break;
         case O_VERSION:
 #ifdef VERSION
-         std::cout << "Version " << VERSION << std::endl << g_szIdStr << std::endl;
+          std::cout << "Version " << VERSION << std::endl << g_szIdStr << std::endl;
 #else
           std::cout << "Unknown version number\n";
 #endif
-         return (0);
-       case O_HELP:
-       case '?':
-         pj2if_usage(argv[0]);
-         return (0);
-       default:
-         pj2if_usage(argv[0]);
-         return (1);
-       }
+          return (0);
+        case O_HELP:
+        case '?':
+          pj2if_usage(argv[0]);
+          return (0);
+        default:
+          pj2if_usage(argv[0]);
+          return (1);
+        }
     }
-  
+
   if (argc - optind != 2) {
     pj2if_usage(argv[0]);
     return (1);
@@ -116,9 +114,9 @@ pj2if_main (const int argc, char *const argv[])
     pj.printScanInfo (os);
     std::cout << os.str();
   }
-  
+
   ImageFile im (pj.nDet(), pj.nView());
-  
+
   ImageFileArray v = im.getArray();
 
   for (int iy = 0; iy < pj.nView(); iy++) {
@@ -132,13 +130,13 @@ pj2if_main (const int argc, char *const argv[])
   im.labelAdd (pj.getLabel());
   im.labelAdd (Array2dFileLabel::L_HISTORY, "Conversion from .pj to .if", timerProgram.timerEnd());
   im.fileWrite (im_name);
-  
+
   return(0);
 }
 
 
 #ifndef NO_MAIN
-int 
+int
 main (const int argc, char *const argv[])
 {
   int retval = 1;