Changeset 38989 for trunk/Ohana/src/libfits/matrix/F_uncompress_M.c

Timestamp:

Oct 27, 2015, 8:39:54 PM (11 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20150625 (pcount is off_t; handle \r\n EOL)

Location:

trunk/Ohana/src/libfits

Files:

• . (modified) (1 prop)
• matrix/F_uncompress_M.c (modified) (2 diffs)

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

@@ -161 +161 @@
 
     // we may have an uncompressed PCOUNT / GCOUNT value, otherwise set to 0,1
-    if (gfits_scan (header, "ZPCOUNT", "%d", 1, &header->pcount)) {
+    if (gfits_scan (header, "ZPCOUNT", OFF_T_FMT, 1, &header->pcount)) {
         gfits_delete (header, "ZPCOUNT", 1);
-        gfits_modify (header, "PCOUNT", "%d", 1, header->pcount);
+        gfits_modify (header, "PCOUNT", OFF_T_FMT, 1, header->pcount);
     } else {
         header->pcount = 0;
-        gfits_modify (header, "PCOUNT", "%d", 1, header->pcount);
+        gfits_modify (header, "PCOUNT", OFF_T_FMT, 1, header->pcount);
     }
     if (gfits_scan (header, "ZGCOUNT", "%d", 1, &header->gcount)) {
@@ -178 +178 @@
     header->pcount = 0;
     header->gcount = 1;
-    gfits_modify (header, "PCOUNT", "%d", 1, header->pcount);
+    gfits_modify (header, "PCOUNT", OFF_T_FMT, 1, header->pcount);
     gfits_modify (header, "GCOUNT", "%d", 1, header->gcount);
   }