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

trunk/Ohana/src/libfits/matrix/F_read_segment.c

@@ -36 +36 @@
 int gfits_fread_matrix_segment (FILE *f, Matrix *matrix, Header *header, char *region) {
 
-  int status, i, nbytes, Nbytes, Nskip, NbytesData;
+  int status;
+  off_t i, nbytes, Nbytes, Nskip, NbytesData;
   int wantaxis[FT_MAX_NAXES][2];
   double tmp;
@@ -65 +66 @@
     matrix[0].Naxis[i] = wantaxis[i][1] - wantaxis[i][0];
 
-  matrix[0].size = abs (matrix[0].bitpix) / 8;
+  matrix[0].datasize = abs (matrix[0].bitpix) / 8;
   for (i = 0; i < matrix[0].Naxes; i++)
-    matrix[0].size *= matrix[0].Naxis[i];
+    matrix[0].datasize *= matrix[0].Naxis[i];
 
   Nskip = wantaxis[2][0]*matrix[0].Naxis[0]*matrix[0].Naxis[1]*abs(matrix[0].bitpix)/8;
-  NbytesData = Nskip + matrix[0].size;
+  NbytesData = Nskip + matrix[0].datasize;
 
   if (NbytesData % FT_RECORD_SIZE) 
-    Nbytes = FT_RECORD_SIZE * ((int) (NbytesData / FT_RECORD_SIZE) + 1) - Nskip;
+    Nbytes = FT_RECORD_SIZE * ((off_t) (NbytesData / FT_RECORD_SIZE) + 1) - Nskip;
   else 
-    Nbytes = FT_RECORD_SIZE * ((int) (NbytesData / FT_RECORD_SIZE)) - Nskip;
+    Nbytes = FT_RECORD_SIZE * ((off_t) (NbytesData / FT_RECORD_SIZE)) - Nskip;
 
   ALLOCATE (matrix[0].buffer, char, MAX (Nbytes, 1));
@@ -86 +87 @@
 
   /* currently only good for reading in full planes in 3-D */
-  fseek (f, Nskip, SEEK_CUR);
+  fseeko (f, Nskip, SEEK_CUR);
   nbytes = fread (matrix[0].buffer, sizeof(char), Nbytes, f);
   if (nbytes != Nbytes) {
@@ -92 +93 @@
   }
 
-  matrix[0].size = Nbytes;
+  matrix[0].datasize = Nbytes;
 
 # ifdef BYTE_SWAP  
@@ -147 +148 @@
 
   if (nbytes < Nbytes - 2880) {  /* this is a bad FITS error: image is not OK */
-    fprintf (stderr, "error reading in matrix data from FITS file (%d < %d - 2880)\n", nbytes, Nbytes);
+    fprintf (stderr, "error reading in matrix data from FITS file (%lld < %lld - 2880)\n", (long long) nbytes, (long long) Nbytes);
     return (FALSE);
   }
   if (nbytes != Nbytes) {  /* this is a FITS error, but often the image is OK */
-    fprintf (stderr, "incomplete block in FITS file: (%d, %d)\n", nbytes, Nbytes);
+    fprintf (stderr, "incomplete block in FITS file: (%lld, %lld)\n", (long long) nbytes, (long long) Nbytes);
     return (TRUE); 
   }