Changeset 27435 for trunk/Ohana/src/opihi/dvo/detrend.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/opihi/dvo/detrend.c (modified) (3 diffs)

trunk/Ohana/src/opihi/dvo/detrend.c

@@ -7 +7 @@
  
   FILE *f;
-  int i, Nimage, status, N, TimeSelect;
+  off_t i, Nimage, status;
+  int N, TimeSelect;
   char DataBase[256];
   time_t tzero, tend;
@@ -133 +134 @@
     return (FALSE);
   }
-  fseek (f, header.size, SEEK_SET);
+  fseeko (f, header.datasize, SEEK_SET);
 
   /* load existing data from database */
-  gfits_scan (&header, "NIMAGES", "%d", 1, &Nimage);
+  gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
   ALLOCATE (pimage, RegImage, Nimage);
   status = fread (pimage, sizeof(RegImage), Nimage, f);
@@ -142 +143 @@
 
   if (status != Nimage) {
-    gprint (GP_ERR, "ERROR: header and data in dB don't match (%d vs %d)\n", Nimage, status);
+    gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %lld)\n", (long long) Nimage, (long long) status);
     gfits_free_header (&header);
     free (pimage);