r279: msvc compatibility changes

[ctsim.git] / tools / phm2pj.cpp

diff --git a/tools/phm2pj.cpp b/tools/phm2pj.cpp
index 80e55662e8a22706b7c8d4a6d9eacad21a076a29..cf4a24f4a098ffe468882fda1342ea747c076038 100644 (file)
--- a/tools/phm2pj.cpp
+++ b/tools/phm2pj.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: phm2pj.cpp,v 1.17 2000/12/16 07:28:25 kevin Exp $
+**  $Id: phm2pj.cpp,v 1.18 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
 **
 **  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,7 +50,7 @@ static struct option phm2pj_options[] =
   {0, 0, 0, 0}
 };
 
   {0, 0, 0, 0}
 };
 

-static const char* g_szIdStr = "$Id: phm2pj.cpp,v 1.17 2000/12/16 07:28:25 kevin Exp $";
+static const char* g_szIdStr = "$Id: phm2pj.cpp,v 1.18 2000/12/17 23:30:48 kevin Exp $";

 
 
 void 
 
 
 void 


@@ -160,7 +160,7 @@ phm2pj_main (int argc, char* argv[])
        opt_rotangle = strtod(optarg, &endptr);
        endstr = optarg + strlen(optarg);
        if (endptr != endstr) {
        opt_rotangle = strtod(optarg, &endptr);
        endstr = optarg + strlen(optarg);
        if (endptr != endstr) {

-         cerr << "Error setting --rotangle to " << optarg << endl;
+         std::cerr << "Error setting --rotangle to " << optarg << endl;

          phm2pj_usage(argv[0]);
          return (1);
        }
          phm2pj_usage(argv[0]);
          return (1);
        }


@@ -172,7 +172,7 @@ phm2pj_main (int argc, char* argv[])
        dOptFocalLength = strtod(optarg, &endptr);
        endstr = optarg + strlen(optarg);
        if (endptr != endstr) {
        dOptFocalLength = strtod(optarg, &endptr);
        endstr = optarg + strlen(optarg);
        if (endptr != endstr) {

-         cerr << "Error setting --focal-length to " << optarg << endl;
+         std::cerr << "Error setting --focal-length to " << optarg << endl;

          phm2pj_usage(argv[0]);
          return (1);
        }
          phm2pj_usage(argv[0]);
          return (1);
        }


@@ -181,7 +181,7 @@ phm2pj_main (int argc, char* argv[])
        dOptFieldOfView = strtod(optarg, &endptr);
        endstr = optarg + strlen(optarg);
        if (endptr != endstr) {
        dOptFieldOfView = strtod(optarg, &endptr);
        endstr = optarg + strlen(optarg);
        if (endptr != endstr) {

-         cerr << "Error setting --field-of-view to " << optarg << endl;
+         std::cerr << "Error setting --field-of-view to " << optarg << endl;

          phm2pj_usage(argv[0]);
          return (1);
        }
          phm2pj_usage(argv[0]);
          return (1);
        }


@@ -190,7 +190,7 @@ phm2pj_main (int argc, char* argv[])
        opt_nray = strtol(optarg, &endptr, 10);
        endstr = optarg + strlen(optarg);
        if (endptr != endstr) {
        opt_nray = strtol(optarg, &endptr, 10);
        endstr = optarg + strlen(optarg);
        if (endptr != endstr) {

-         cerr << "Error setting --nray to %s" << optarg << endl;
+         std::cerr << "Error setting --nray to %s" << optarg << endl;

          phm2pj_usage(argv[0]);
          return (1);
        }
          phm2pj_usage(argv[0]);
          return (1);
        }


@@ -213,7 +213,7 @@ phm2pj_main (int argc, char* argv[])
     }
   
     if (optPhmName == "" && optPhmFileName == "") {
     }
   
     if (optPhmName == "" && optPhmFileName == "") {

-      cerr << "No phantom defined\n" << endl;
+      std::cerr << "No phantom defined\n" << endl;

       phm2pj_usage(argv[0]);
       return (1);
     }
       phm2pj_usage(argv[0]);
       return (1);
     }


@@ -226,14 +226,14 @@ phm2pj_main (int argc, char* argv[])
     opt_ndet = strtol(argv[optind+1], &endptr, 10);
     endstr = argv[optind+1] + strlen(argv[optind+1]);
     if (endptr != endstr) {
     opt_ndet = strtol(argv[optind+1], &endptr, 10);
     endstr = argv[optind+1] + strlen(argv[optind+1]);
     if (endptr != endstr) {

-      cerr << "Error setting --ndet to " << argv[optind+1] << endl;
+      std::cerr << "Error setting --ndet to " << argv[optind+1] << endl;

       phm2pj_usage(argv[0]);
       return (1);
     }
     opt_nview = strtol(argv[optind+2], &endptr, 10);
     endstr = argv[optind+2] + strlen(argv[optind+2]);
     if (endptr != endstr) {
       phm2pj_usage(argv[0]);
       return (1);
     }
     opt_nview = strtol(argv[optind+2], &endptr, 10);
     endstr = argv[optind+2] + strlen(argv[optind+2]);
     if (endptr != endstr) {

-      cerr << "Error setting --nview to " << argv[optind+2] << endl;
+      std::cerr << "Error setting --nview to " << argv[optind+2] << endl;

       phm2pj_usage(argv[0]);
       return (1);
     }
       phm2pj_usage(argv[0]);
       return (1);
     }


@@ -261,7 +261,7 @@ phm2pj_main (int argc, char* argv[])
 
     if (optPhmFileName != "") {
 #ifdef HAVE_MPI
 
     if (optPhmFileName != "") {
 #ifdef HAVE_MPI

-      cerr << "Can not read phantom from file in MPI mode\n";
+      std::cerr << "Can not read phantom from file in MPI mode\n";

       return (1);
 #endif
       phm.createFromFile (optPhmFileName.c_str());
       return (1);
 #endif
       phm.createFromFile (optPhmFileName.c_str());


@@ -420,9 +420,9 @@ main (int argc, char* argv[])
     //    dmalloc_shutdown();
 #endif
   } catch (exception e) {
     //    dmalloc_shutdown();
 #endif
   } catch (exception e) {

-    cerr << "Exception: " << e.what() << endl;
+    std::cerr << "Exception: " << e.what() << endl;

   } catch (...) {
   } catch (...) {

-    cerr << "Unknown exception\n";
+    std::cerr << "Unknown exception\n";

   }
 
   return (retval);
   }
 
   return (retval);