X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=tools%2Fpj2if.cpp;h=bc39fdc7ade5ebf4776e4da0638a9fff889629ac;hp=29907f59e5d903a2ee24643b8a38629737677fc7;hb=1a050c98763fbbc0662731b0b76953acede6f5d7;hpb=065c60e43bbd0649f42fde5351dc073f59b3aa28 diff --git a/tools/pj2if.cpp b/tools/pj2if.cpp index 29907f5..bc39fdc 100644 --- a/tools/pj2if.cpp +++ b/tools/pj2if.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: pj2if.cpp,v 1.8 2001/01/16 20:55:29 kevin Exp $ +** $Id$ ** ** 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 +26,7 @@ ******************************************************************************/ /* FILE - * pj2if.c Convert Raysum to image + * pj2if.c Convert Raysum to image * * DATE * Apr 1999 @@ -47,9 +47,9 @@ static struct option my_options[] = {0, 0, 0, 0} }; -static const char* g_szIdStr = "$Id: pj2if.cpp,v 1.8 2001/01/16 20:55: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,12 +61,11 @@ 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; bool optVerbose = false; - bool optDump = false; extern int optind; Timer timerProgram; @@ -74,30 +73,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); @@ -117,9 +116,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++) { @@ -133,13 +132,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;