projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r121: *** empty log message ***
[ctsim.git]
/
src
/
pj2if.cpp
diff --git
a/src/pj2if.cpp
b/src/pj2if.cpp
index 530f23be1537bf1fe6eeffbcb5fea650eec0ef67..963a5cb2b4088294476f7373d15a9c4e54927f81 100644
(file)
--- a/
src/pj2if.cpp
+++ b/
src/pj2if.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: pj2if.cpp,v 1.
2 2000/06/18 10:27:11
kevin Exp $
+** $Id: pj2if.cpp,v 1.
4 2000/06/26 21:15:24
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
@@
-112,7
+112,7
@@
pj2if_main (const int argc, char *const argv[])
if (opt_verbose)
pj.printScanInfo();
if (opt_verbose)
pj.printScanInfo();
- ImageFile im (
im_name,
pj.nDet(), pj.nView());
+ ImageFile im (pj.nDet(), pj.nView());
ImageFileArray v = im.getArray();
ImageFileArray v = im.getArray();
@@
-126,11
+126,9
@@
pj2if_main (const int argc, char *const argv[])
}
}
}
}
- im.fileCreate ();
- im.arrayDataWrite ();
im.labelAdd (Array2dFileLabel::L_HISTORY, pj.remark(), pj.calcTime());
im.labelAdd (Array2dFileLabel::L_HISTORY, "Conversion from .pj to .if");
im.labelAdd (Array2dFileLabel::L_HISTORY, pj.remark(), pj.calcTime());
im.labelAdd (Array2dFileLabel::L_HISTORY, "Conversion from .pj to .if");
- im.file
Close (
);
+ im.file
Write (im_name
);
return(0);
}
return(0);
}
@@
-140,6
+138,16
@@
pj2if_main (const int argc, char *const argv[])
int
main (const int argc, char *const argv[])
{
int
main (const int argc, char *const argv[])
{
- return (pj2if_main(argc, argv));
+ int retval = 1;
+
+ try {
+ retval = pj2if_main(argc, argv);
+ } catch (exception e) {
+ cerr << "Exception: " << e.what() << endl;
+ } catch (...) {
+ cerr << "Unknown exception" << endl;
+ }
+
+ return (retval);
}
#endif
}
#endif