Changeset 38989 for trunk/Ohana/src/libfits

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)
• header/F_read_H.c (modified) (1 diff)
• include/gfitsio.h (modified) (1 diff)
• matrix/F_uncompress_M.c (modified) (2 diffs)
• table/F_create_TH.c (modified) (1 diff)

trunk/Ohana/src/libfits/header/F_read_H.c

@@ -85 +85 @@
   gfits_scan (header, "NAXIS10", OFF_T_FMT, 1,  &header[0].Naxis[9]);
 
-  if (!gfits_scan (header, "PCOUNT",  "%d", 1, &header[0].pcount)) {
+  if (!gfits_scan (header, "PCOUNT",  OFF_T_FMT, 1, &header[0].pcount)) {
     header[0].pcount = 0;
   }

trunk/Ohana/src/libfits/include/gfitsio.h

@@ -46 +46 @@
   off_t                   Naxis[FT_MAX_NAXES];
   off_t                   datasize;
-  int                     pcount;
+  off_t                   pcount;
   int                     gcount;
   double                  bzero;

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);
   }

trunk/Ohana/src/libfits/table/F_create_TH.c

@@ -31 +31 @@
   }
   
-  gfits_modify (header, "PCOUNT", "%d", 1, header[0].pcount);
+  gfits_modify (header, "PCOUNT", OFF_T_FMT, 1, header[0].pcount);
   gfits_modify (header, "GCOUNT", "%d", 1, header[0].gcount);
   if (!strcmp (type, "IMAGE")) {