Changeset 27838 for branches/tap_branches/Ohana/src/getstar/src/ReadImageFiles.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/getstar/src/ReadImageFiles.c (modified) (5 diffs)

branches/tap_branches/Ohana/src/getstar/src/ReadImageFiles.c

@@ -2 +2 @@
 # define DVO_IMAGE_NAME_LEN 128
 
-Image *ReadImageFiles (char *filename, int *Nimages) {
-
-  int i, j, N, Nfile, Nheader, NHEADER, Nimage, NIMAGE;
-  int Nskip, Nhead, Ndata, done, status, mode;
+Image *ReadImageFiles (char *filename, off_t *Nimages) {
+
+  off_t Nskip, *extsize;
+  int i, j, N, Nfile, Nheader, Nimage, NHEADER, NIMAGE;
+  int Nhead, Ndata, done, status, mode;
   char **file, *name;
   FILE *f;
   glob_t globList;
   char **exthead, **extdata, **exttype, tmpword[80];
-  int *extnum_head, *extnum_data, *extsize;
+  int *extnum_head, *extnum_data;
   Header *header, **headers;
   Image *image;
@@ -89 +90 @@
   headers[0] = header;
   Nskip = gfits_data_size (header);
-  fseek (f, Nskip, SEEK_CUR); 
+  fseeko (f, Nskip, SEEK_CUR); 
 
   // load all headers into memory
@@ -118 +119 @@
   ALLOCATE (extnum_head, int, NIMAGE);
   ALLOCATE (extnum_data, int, NIMAGE);
-  ALLOCATE (extsize, int, Nheader);
+  ALLOCATE (extsize, off_t, Nheader);
 
   if (mode == MOSAIC_MEF) {
@@ -130 +131 @@
   // now examine the headers, count the table entries, find corresponding headers
   for (i = 0; i < Nheader; i++) {
-      extsize[i] = headers[i][0].size + gfits_data_size (headers[i]);
+      extsize[i] = headers[i][0].datasize + gfits_data_size (headers[i]);
       gfits_scan (headers[i], "EXTTYPE", "%s", 1, tmpword);
 
@@ -166 +167 @@
   // extension matched to the header in the PHU
   if (Nimage == 0) {
-      extsize[0] = headers[0][0].size + gfits_data_size (headers[0]);
-      extsize[1] = headers[1][0].size + gfits_data_size (headers[1]);
+      extsize[0] = headers[0][0].datasize + gfits_data_size (headers[0]);
+      extsize[1] = headers[1][0].datasize + gfits_data_size (headers[1]);
       gfits_scan (headers[1], "EXTNAME", "%s", 1, tmpword);
       if (!strcmp (tmpword, "SMPFILE")) {