** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: ifinfo.cpp,v 1.10 2000/06/25 17:32:24 kevin Exp $
+** $Id: ifinfo.cpp,v 1.12 2000/06/27 10:48:11 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
in_file = argv[optind];
- im = new ImageFile (in_file.c_str());
- if (! im->fileRead ()) {
+ im = new ImageFile ();
+ if (! im->fileRead (in_file.c_str())) {
sys_error (ERR_WARNING, "Unable to read file %s", in_file.c_str());
return (1);
}
if (in2_file != "") {
- im2 = new ImageFile(in2_file.c_str());
- if (! im2->fileRead ()) {
+ im2 = new ImageFile();
+ if (! im2->fileRead (in2_file.c_str())) {
sys_error (ERR_WARNING, "Unable to read file %s", in2_file.c_str());
return (1);
}
if (opt_stats)
cout << "Image size: (" << im->nx() << "," << im->ny() << ")" << endl << endl;
+ if (im2)
+ cout << "Image 1: " << im->getFilename() << endl;
+
if (opt_labels)
im->printLabels (cout);
if (opt_stats) {
- if (im2)
- cout << "Image 1" << endl;
-
im->printStatistics (cout);
if (im2) {
cout << endl;
+ cout << "Image 2: " << im2->getFilename() << endl;
+
if (opt_labels)
im2->printLabels(cout);
- cout << "Image 2" << endl;
im2->printStatistics (cout);
cout << endl;