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

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

@@ -13 +13 @@
 int gfits_load_matrix (FILE *f, Matrix *matrix, Header *header) {
 
-  int i, nbytes, Nbytes;
+  
+  off_t i, nbytes, Nbytes;
 
   matrix[0].bitpix = header[0].bitpix;
@@ -25 +26 @@
   Nbytes = gfits_data_size (header);
   ALLOCATE (matrix[0].buffer, char, Nbytes);
-  matrix[0].size = Nbytes;
+  matrix[0].datasize = Nbytes;
 
   nbytes = fread (matrix[0].buffer, sizeof(char), Nbytes, f);
@@ -94 +95 @@
   }
   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); 
   }