projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Update package dependency from libwxgtk3.0-dev to libwxgtk3.0-gtk3-dev for...
[ctsim.git]
/
tools
/
if2.cpp
diff --git
a/tools/if2.cpp
b/tools/if2.cpp
index bc984c8c4254946e5310a7b87984a2e7ab726d0e..b264046360d4437c333d0e5750da553fcc0d1efe 100644
(file)
--- a/
tools/if2.cpp
+++ b/
tools/if2.cpp
@@
-86,7
+86,8
@@
if2_main (int argc, char *const argv[])
int opt_rowPlot = -1;
int opt_columnPlot = -1;
Timer timerProgram;
int opt_rowPlot = -1;
int opt_columnPlot = -1;
Timer timerProgram;
-
+ UNUSED(opt_verbose);
+
while (1) {
char* endptr;
int c = getopt_long (argc, argv, "", my_options, NULL);
while (1) {
char* endptr;
int c = getopt_long (argc, argv, "", my_options, NULL);
@@
-182,19
+183,20
@@
if2_main (int argc, char *const argv[])
return(1);
}
return(1);
}
- ImageFileArray v1 = im_in1.getArray();
- ImageFileArray v2 = im_in2.getArray();
- ImageFileArray vout = NULL;
-
if (opt_bImageOutputFile && opt_bPlotOutputFile) {
sys_error (ERR_SEVERE, "Both Image and Plot output files can not be selected simultaneously");
return (1);
}
if (opt_bImageOutputFile && opt_bPlotOutputFile) {
sys_error (ERR_SEVERE, "Both Image and Plot output files can not be selected simultaneously");
return (1);
}
+
+ ImageFileArray v1 = im_in1.getArray();
+ ImageFileArray v2 = im_in2.getArray();
+ ImageFileArray vout = NULL;
if (opt_bImageOutputFile) {
pim_out = new ImageFile (im_in1.nx(), im_in1.ny());
vout = pim_out->getArray();
}
if (opt_bImageOutputFile) {
pim_out = new ImageFile (im_in1.nx(), im_in1.ny());
vout = pim_out->getArray();
}
-
+ UNUSED(vout);
+
std::string strOperation;
int nx = im_in1.nx();
int ny = im_in1.ny();
std::string strOperation;
int nx = im_in1.nx();
int ny = im_in1.ny();
@@
-217,7
+219,8
@@
if2_main (int argc, char *const argv[])
if (opt_comp) {
double d, r, e;
im_in1.comparativeStatistics (im_in2, d, r, e);
if (opt_comp) {
double d, r, e;
im_in1.comparativeStatistics (im_in2, d, r, e);
- std::cout << "d=" << d << ", r=" << r << ", e=" << e << std::endl;
+ std::cout << std::setprecision(7) <<
+ "d=" << d << ", r=" << r << ", e=" << e << std::endl;
}
int i;
}
int i;