Changeset 27435 for trunk/Ohana/src/libfits/header/F_read_H.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/header/F_read_H.c (modified) (4 diffs)

trunk/Ohana/src/libfits/header/F_read_H.c

@@ -23 +23 @@
 int gfits_load_header (FILE *f, Header *header) {
 
-  int i, done, Nbytes, t1, t2;
+  off_t i, Nbytes;
+  int done, t1, t2;
   char *p;
 
-  header[0].size = 0;
+  header[0].datasize = 0;
   done = FALSE;
   ALLOCATE (header[0].buffer, char, 1);
@@ -32 +33 @@
   for (i = 0; !done; i++) {
     REALLOCATE (header[0].buffer, char, (i + 1)*FT_RECORD_SIZE);
-    Nbytes = fread (&header[0].buffer[i*FT_RECORD_SIZE], 
-                    sizeof(char), FT_RECORD_SIZE, f);
+    Nbytes = fread (&header[0].buffer[i*FT_RECORD_SIZE], sizeof(char), FT_RECORD_SIZE, f);
     if (Nbytes != FT_RECORD_SIZE) {
       if (feof(f)) return (FALSE);
@@ -40 +40 @@
     }
     
-    header[0].size += Nbytes;
+    header[0].datasize += Nbytes;
 
     if (i == 0) { 
@@ -60 +60 @@
     header[0].Naxis[i] = 0;
 
-  gfits_scan (header,  "SIMPLE", "%t",   1, &header[0].simple);
+  gfits_scan_alt (header,  "SIMPLE", "%t",   1, &header[0].simple);
   gfits_scan (header,  "BITPIX", "%d",   1, &header[0].bitpix);
   gfits_scan (header,  "NAXIS",  "%d",   1, &header[0].Naxes);
                                                            
-  gfits_scan (header,  "EXTEND", "%t",   1, &header[0].extend);
-  gfits_scan (header,  "UNSIGN", "%t",   1, &header[0].unsign);
+  gfits_scan_alt (header,  "EXTEND", "%t",   1, &header[0].extend);
+  gfits_scan_alt (header,  "UNSIGN", "%t",   1, &header[0].unsign);
   gfits_scan (header,  "BSCALE", "%lf",  1, &header[0].bscale);
   gfits_scan (header,  "BZERO",  "%lf",  1, &header[0].bzero);
                                        
-  gfits_scan (header,  "NAXIS1", "%d", 1, &header[0].Naxis[0]);
-  gfits_scan (header,  "NAXIS2", "%d", 1, &header[0].Naxis[1]);
-  gfits_scan (header,  "NAXIS3", "%d", 1, &header[0].Naxis[2]);
-  gfits_scan (header,  "NAXIS4", "%d", 1, &header[0].Naxis[3]);
-  gfits_scan (header,  "NAXIS5", "%d", 1, &header[0].Naxis[4]);
-  gfits_scan (header,  "NAXIS6", "%d", 1, &header[0].Naxis[5]);
-  gfits_scan (header,  "NAXIS7", "%d", 1, &header[0].Naxis[6]);
-  gfits_scan (header,  "NAXIS8", "%d", 1, &header[0].Naxis[7]);
-  gfits_scan (header,  "NAXIS9", "%d", 1, &header[0].Naxis[8]);
-  gfits_scan (header, "NAXIS10", "%d", 1, &header[0].Naxis[9]);
+  gfits_scan (header,  "NAXIS1", "%lld", 1, (long long *) &header[0].Naxis[0]);
+  gfits_scan (header,  "NAXIS2", "%lld", 1, (long long *) &header[0].Naxis[1]);
+  gfits_scan (header,  "NAXIS3", "%lld", 1, (long long *) &header[0].Naxis[2]);
+  gfits_scan (header,  "NAXIS4", "%lld", 1, (long long *) &header[0].Naxis[3]);
+  gfits_scan (header,  "NAXIS5", "%lld", 1, (long long *) &header[0].Naxis[4]);
+  gfits_scan (header,  "NAXIS6", "%lld", 1, (long long *) &header[0].Naxis[5]);
+  gfits_scan (header,  "NAXIS7", "%lld", 1, (long long *) &header[0].Naxis[6]);
+  gfits_scan (header,  "NAXIS8", "%lld", 1, (long long *) &header[0].Naxis[7]);
+  gfits_scan (header,  "NAXIS9", "%lld", 1, (long long *) &header[0].Naxis[8]);
+  gfits_scan (header, "NAXIS10", "%lld", 1, (long long *) &header[0].Naxis[9]);
 
   if (!gfits_scan (header, "PCOUNT",  "%d", 1, &header[0].pcount)) {