projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r102: fixed mpi bug
[ctsim.git]
/
src
/
if2img.cpp
diff --git
a/src/if2img.cpp
b/src/if2img.cpp
index 018e504abf6027fc741ce9fe555d8ea47475515b..c3a4bfe801ab80d56c42cd8afc4055db9faaaaec 100644
(file)
--- a/
src/if2img.cpp
+++ b/
src/if2img.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: if2img.cpp,v 1.
6 2000/06/18 10:27:11
kevin Exp $
+** $Id: if2img.cpp,v 1.
7 2000/06/19 17:58:13
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
@@
-255,7
+255,7
@@
if2img_main (int argc, char *const argv[])
#else
cout << "Unknown version number" << endl;
#endif
#else
cout << "Unknown version number" << endl;
#endif
-
exit
(0);
+
return
(0);
case O_HELP:
case '?':
if2img_usage(argv[0]);
case O_HELP:
case '?':
if2img_usage(argv[0]);
@@
-282,7
+282,7
@@
if2img_main (int argc, char *const argv[])
pim = new ImageFile (in_file);
ImageFile& im = *pim;
if (! im.fileRead()) {
pim = new ImageFile (in_file);
ImageFile& im = *pim;
if (! im.fileRead()) {
- sys_error (ERR_
SEVERE
, "File %s does not exist", in_file);
+ sys_error (ERR_
FATAL
, "File %s does not exist", in_file);
return (1);
}
return (1);
}
@@
-631,8
+631,8
@@
sdf2d_to_gif (ImageFile& im, char *outfile, int nxcell, int nycell, double densm
delete rowp;
if ((out = fopen(outfile,"w")) == NULL) {
delete rowp;
if ((out = fopen(outfile,"w")) == NULL) {
- sys_error(ERR_
SEVERE,
"Error opening output file %s for writing", outfile);
-
exit
(1);
+ sys_error(ERR_
FATAL,
"Error opening output file %s for writing", outfile);
+
return
(1);
}
gdImageGif(gif,out);
fclose(out);
}
gdImageGif(gif,out);
fclose(out);
@@
-646,6
+646,16
@@
sdf2d_to_gif (ImageFile& im, char *outfile, int nxcell, int nycell, double densm
int
main (int argc, char *const argv[])
{
int
main (int argc, char *const argv[])
{
- return (if2img_main(argc, argv));
+ int retval = 1;
+
+ try {
+ retval = if2img_main(argc, argv);
+ } catch (exception e) {
+ cerr << "Exception: " << e.what() << endl;
+ } catch (...) {
+ cerr << "Unknown exception" << endl;
+ }
+
+ return (retval);
}
#endif
}
#endif