Changeset 27435 for trunk/Ohana/src/libfits/table/F_read_TH.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/libfits/table/F_read_TH.c (modified) (5 diffs)

trunk/Ohana/src/libfits/table/F_read_TH.c

@@ -7 +7 @@
   FILE *f;
   Header header;
-  int status, Nbytes;
+  int status;
+  off_t Nbytes;
   
   status = gfits_read_header (filename, &header);
@@ -23 +24 @@
 
   Nbytes = gfits_data_size (&header);
-  fseek (f, Nbytes, SEEK_SET);
+  fseeko (f, Nbytes, SEEK_SET);
   gfits_free_header (&header);
 
@@ -36 +37 @@
   
   char *p;
-  int i, done, status, Nbytes;
+  int i, done, status;
+  off_t Nbytes;
   
-  Theader[0].size = 0;
+  Theader[0].datasize = 0;
   done = FALSE;
   ALLOCATE (Theader[0].buffer, char, 1);
@@ -44 +46 @@
   for (i = 0; !done; i++) {
     REALLOCATE (Theader[0].buffer, char, (i + 1)*FT_RECORD_SIZE);
-    Nbytes = fread (&Theader[0].buffer[i*FT_RECORD_SIZE], 
-                    sizeof(char), FT_RECORD_SIZE, f);
+    Nbytes = fread (&Theader[0].buffer[i*FT_RECORD_SIZE], sizeof(char), FT_RECORD_SIZE, f);
     if (Nbytes != FT_RECORD_SIZE) {
       perror ("fits matrix read error");
     }
 
-    Theader[0].size += Nbytes;
-    if (Nbytes != FT_RECORD_SIZE) 
+    Theader[0].datasize += Nbytes;
+    if (Nbytes != FT_RECORD_SIZE) {
       done = TRUE;
+    }
     p = gfits_header_field (Theader, "END", 1);
     if (p != NULL)
@@ -68 +70 @@
   if (!status) return (FALSE);
                                                            
-  gfits_scan (Theader,  "NAXIS1", "%d", 1, &Theader[0].Naxis[0]);
-  gfits_scan (Theader,  "NAXIS2", "%d", 1, &Theader[0].Naxis[1]);
-  gfits_scan (Theader,  "NAXIS3", "%d", 1, &Theader[0].Naxis[2]);
-  gfits_scan (Theader,  "NAXIS4", "%d", 1, &Theader[0].Naxis[3]);
-  gfits_scan (Theader,  "NAXIS5", "%d", 1, &Theader[0].Naxis[4]);
-  gfits_scan (Theader,  "NAXIS6", "%d", 1, &Theader[0].Naxis[5]);
-  gfits_scan (Theader,  "NAXIS7", "%d", 1, &Theader[0].Naxis[6]);
-  gfits_scan (Theader,  "NAXIS8", "%d", 1, &Theader[0].Naxis[7]);
-  gfits_scan (Theader,  "NAXIS9", "%d", 1, &Theader[0].Naxis[8]);
-  gfits_scan (Theader, "NAXIS10", "%d", 1, &Theader[0].Naxis[9]);
+  gfits_scan (Theader,  "NAXIS1", "%lld", 1, (long long *) &Theader[0].Naxis[0]);
+  gfits_scan (Theader,  "NAXIS2", "%lld", 1, (long long *) &Theader[0].Naxis[1]);
+  gfits_scan (Theader,  "NAXIS3", "%lld", 1, (long long *) &Theader[0].Naxis[2]);
+  gfits_scan (Theader,  "NAXIS4", "%lld", 1, (long long *) &Theader[0].Naxis[3]);
+  gfits_scan (Theader,  "NAXIS5", "%lld", 1, (long long *) &Theader[0].Naxis[4]);
+  gfits_scan (Theader,  "NAXIS6", "%lld", 1, (long long *) &Theader[0].Naxis[5]);
+  gfits_scan (Theader,  "NAXIS7", "%lld", 1, (long long *) &Theader[0].Naxis[6]);
+  gfits_scan (Theader,  "NAXIS8", "%lld", 1, (long long *) &Theader[0].Naxis[7]);
+  gfits_scan (Theader,  "NAXIS9", "%lld", 1, (long long *) &Theader[0].Naxis[8]);
+  gfits_scan (Theader, "NAXIS10", "%lld", 1, (long long *) &Theader[0].Naxis[9]);
 
   return (TRUE);