Changeset 27435 for trunk/Ohana/src/imregister/imreg/output.c

Timestamp:

Mar 24, 2010, 11:22:25 AM (16 years ago)

Author:

eugene

Message:

large update merging in changes for Ohana to support large files

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/imregister/imreg/output.c (modified) (6 diffs)

trunk/Ohana/src/imregister/imreg/output.c

@@ -24 +24 @@
 
 /* given a subset list, write out the selected images, if desired */
-void OutputSubset (RegImage *image, int Nimage, int *match, int Nmatch) {
+void OutputSubset (RegImage *image, off_t Nimage, off_t *match, off_t Nmatch) {
 
   if (output.table != (char *) NULL) {
@@ -45 +45 @@
 
 /* write out complete binary FITS table in format of db */
-void DumpFitsBintable (char *filename, RegImage *image, int *match, int Nmatch) {
-
-  int i, j;
+void DumpFitsBintable (char *filename, RegImage *image, off_t *match, off_t Nmatch) {
+
+  off_t i, j;
   FILE *f;
   Header header;
@@ -87 +87 @@
 }
 
-void DumpFitsTable (char *filename, RegImage *image, int *match, int Nmatch) {
-  
-  int i;
+void DumpFitsTable (char *filename, RegImage *image, off_t *match, off_t Nmatch) {
+  
+  off_t i;
   char *obsstr, *regstr, *line, dummy[64];
   char *modestr, *typestr, *ccdstr, *datestr;
@@ -184 +184 @@
 
 /* Select, TimeMode are global */
-int PrintSubset (RegImage *image, int *match, int Nmatch) {
+int PrintSubset (RegImage *image, off_t *match, off_t Nmatch) {
   
   char ccdstr[64];  
-  int i, j;
+  off_t i, j;
   char *modestr, *typestr, *timestr, *root, *path;
 
@@ -227 +227 @@
     } else {
       /* this is somewhat poor: I have predefined a subset of value, and I can't guarantee that 'filter' has no spaces */
-      fprintf (stdout, "%5d %6s %6s %s  ", i, typestr, modestr, ccdstr);
+      fprintf (stdout, "%5lld %6s %6s %s  ", (long long) i, typestr, modestr, ccdstr);
       fprintf (stdout, "%s %s  ", image[i].pathname, image[i].filename);
       fprintf (stdout, "%s %f %s %f %f %f\n", image[i].filter, image[i].exptime, 
@@ -238 +238 @@
 }
 
-int dump_data (RegImage *image, int Nimage) {
-
-  int i;
+int dump_data (RegImage *image, off_t Nimage) {
+
+  off_t i;
 
   for (i = 0; i < Nimage; i++) {