Changeset 15487 for trunk/Ohana/src/getstar

Timestamp:

Nov 6, 2007, 5:09:52 PM (19 years ago)

Author:

eugene

Message:

merging changes from eam_branch_20071015 (read compressed images, clean addstar I/O, other minor issues)

File:

• trunk/Ohana/src/getstar/src/ReadImageFiles.c (modified) (4 diffs)

trunk/Ohana/src/getstar/src/ReadImageFiles.c

@@ -87 +87 @@
   // the first header is already loaded
   headers[0] = header;
-  Nskip = gfits_matrix_size (header);
+  Nskip = gfits_data_size (header);
   fseek (f, Nskip, SEEK_CUR); 
 
@@ -98 +98 @@
           done = TRUE;
       } else {
-          Nskip = gfits_matrix_size (headers[i]);
+          Nskip = gfits_data_size (headers[i]);
           fseek (f, Nskip, SEEK_CUR); 
       }
@@ -129 +129 @@
   // now examine the headers, count the table entries, find corresponding headers
   for (i = 0; i < Nheader; i++) {
-      extsize[i] = headers[i][0].size + gfits_matrix_size (headers[i]);
+      extsize[i] = headers[i][0].size + gfits_data_size (headers[i]);
       gfits_scan (headers[i], "EXTTYPE", "%s", 1, tmpword);
 
@@ -163 +163 @@
   // extension matched to the header in the PHU
   if (Nimage == 0) {
-      extsize[0] = headers[0][0].size + gfits_matrix_size (headers[0]);
-      extsize[1] = headers[1][0].size + gfits_matrix_size (headers[1]);
+      extsize[0] = headers[0][0].size + gfits_data_size (headers[0]);
+      extsize[1] = headers[1][0].size + gfits_data_size (headers[1]);
       gfits_scan (headers[1], "EXTNAME", "%s", 1, tmpword);
       if (!strcmp (tmpword, "SMPFILE")) {