Changeset 38447 for branches/eam_branches/ipp-20150419/Ohana/src/libfits/matrix/F_matrix.c

Timestamp:

Jun 12, 2015, 9:44:51 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20150419/Ohana/src

Files:

• . (modified) (1 prop)
• libfits/matrix/F_matrix.c (modified) (4 diffs)

branches/eam_branches/ipp-20150419/Ohana/src/libfits/matrix/F_matrix.c

@@ -2 +2 @@
 # include <gfitsio.h>
 
-off_t gfits_data_size (Header *header) {
-  
-  int i;
-  off_t Nrec, size;
-
-  if (header[0].Naxes == 0) return (0);
-
-  size = abs(header[0].bitpix / 8);
-
-  for (i = 0; i < header[0].Naxes; i++)
-    size *= header[0].Naxis[i];
-
-  // XXX do I multiply this times gcount?
-  size += header[0].pcount;
-
-  /* round up to next complete block */
-  if (size % FT_RECORD_SIZE) {
-    Nrec = 1 + (int) (size / FT_RECORD_SIZE);
-    size = FT_RECORD_SIZE * Nrec;
-  }
-
-  return (size);
-}
-
-off_t gfits_data_min_size (Header *header) {
+off_t gfits_heap_start (Header *header) {
   
   int i;
@@ -38 +14 @@
     size *= header[0].Naxis[i];
 
-  // XXX do I multiply this times gcount?
+  return (size);
+}
+
+off_t gfits_data_min_size (Header *header) {
+  
+  off_t size = gfits_heap_start (header);
   size += header[0].pcount;
+
+  // XXX what do I do with gcount?
 
   return (size);
@@ -46 +29 @@
 off_t gfits_data_pad_size (off_t rawsize) {
   
-  off_t Nrec, size;
-
-  size = rawsize;
+  off_t size = rawsize;
 
   /* round up to next complete block */
   if (rawsize % FT_RECORD_SIZE) {
-    Nrec = 1 + (int) (rawsize / FT_RECORD_SIZE);
+    off_t Nrec = 1 + (int) (rawsize / FT_RECORD_SIZE);
     size = FT_RECORD_SIZE * Nrec;
   }
@@ -58 +39 @@
   return (size);
 }
+
+off_t gfits_data_size (Header *header) {
+  off_t rawsize = gfits_data_min_size(header);
+  off_t size = gfits_data_pad_size (rawsize);
+
+  return (size);
+}
+