** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: if2img.cpp,v 1.7 2000/06/19 17:58:13 kevin Exp $
+** $Id: if2img.cpp,v 1.9 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
out_file = argv[optind+1];
else out_file = NULL;
- pim = new ImageFile (in_file);
+ pim = new ImageFile ();
ImageFile& im = *pim;
- if (! im.fileRead()) {
+ if (! im.fileRead(in_file)) {
sys_error (ERR_FATAL, "File %s does not exist", in_file);
return (1);
}
- if (opt_labels) {
- int nlabels = im.getNumLabels();
-
- for (int i = 0; i < nlabels; i++) {
- Array2dFileLabel label;
- im.labelRead (label, i);
-
- if (label.getLabelType() == Array2dFileLabel::L_HISTORY) {
- cout << "History: " << label.getLabelString() << endl;
- cout << " calc time = " << label.getCalcTime() << " secs" << endl;
- cout << " Timestamp = " << label.getDateString() << endl;
- } else if (label.getLabelType() == Array2dFileLabel::L_USER) {
- cout << "Note: " << label.getLabelString() << endl;
- cout << " Timestamp = %s" << label.getDateString() << endl;
- }
- }
- }
+ if (opt_labels)
+ im.printLabels(cout);
if (opt_stats || (! (opt_set_max && opt_set_min))) {
double minfound = HUGE_VAL, maxfound = -HUGE_VAL;
int ny = im.ny();
ImageFileArray v = im.getArray();
- unsigned char* rowp = new unsigned char [nx * nxcell];
+ unsigned char rowp [nx * nxcell];
if ((fp = fopen (outfile, "wb")) == NULL)
return;
fprintf(fp, "%c ", rowp[ic]);
}
}
- delete rowp;
fclose(fp);
}
int ny = im.ny();
ImageFileArray v = im.getArray();
- unsigned char* rowp = new unsigned char [nx * nxcell];
+ unsigned char rowp [nx * nxcell];
if (rowp == NULL)
return;
fprintf(fp, "\n");
}
}
- delete rowp;
fclose(fp);
}
int ny = im.ny();
ImageFileArray v = im.getArray();
- unsigned char* rowp = new unsigned char [nx * nxcell * (bitdepth / 8)];
+ unsigned char rowp [nx * nxcell * (bitdepth / 8)];
if ((fp = fopen (outfile, "wb")) == NULL)
return;
for (int ir = 0; ir < nycell; ir++)
png_write_rows (png_ptr, &row_pointer, 1);
}
- delete rowp;
png_write_end(png_ptr, info_ptr);
png_destroy_write_struct(&png_ptr, &info_ptr);
int ny = im.ny();
ImageFileArray v = im.getArray();
- usnigned char* rowp = new unsigned char [nx * nxcell];
+ unsigned char rowp [nx * nxcell];
if (rowp == NULL)
return;
}
}
}
- delete rowp;
if ((out = fopen(outfile,"w")) == NULL) {
sys_error(ERR_FATAL, "Error opening output file %s for writing", outfile);