Changeset 38989 for trunk

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

Files:

• libfits (modified) (1 prop)
• libfits/header/F_read_H.c (modified) (1 diff)
• libfits/include/gfitsio.h (modified) (1 diff)
• libfits/matrix/F_uncompress_M.c (modified) (2 diffs)
• libfits/table/F_create_TH.c (modified) (1 diff)
• opihi/cmd.astro (modified) (1 prop)
• opihi/cmd.data/read_vectors.c (modified) (4 diffs)

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")) {

trunk/Ohana/src/opihi/cmd.data/read_vectors.c

@@ -190 +190 @@
   ALLOCATE (buffer, char, 0x10001);
   bzero (buffer, 0x10001);
+
+  /* 
   for (i = 0; i < Nskip; i++) {
     if (scan_line_maxlen (f, buffer, 0x10000) == EOF) {
@@ -197 +199 @@
     }
   }
+  */
+
+  int Nline_read = 0; // track number of lines read so far (use to skip lines as well)
 
   // we have a working buffer read from the file. we parse the lines in the working buffer
   // until we reach the last chunk without an EOL char.  at that point, we shift the start
   // of the last (partial) line to the start of the buffer and re-fill.
+
+  // we treat \n\r pair as a single EOL char to handle mac files:
 
   Nstart = 0; // location of the last valid byte in the buffer (start filling here)
@@ -218 +225 @@
     c0 = buffer; // c0 always marks the start of a line
     while (bufferStatus) {
-      c1 = strchr (c0, '\n'); // find the end of this current line
+      c1 = strchr (c0, '\n'); // find the end of this current line (also valid for a Mac: \r\n)
       if (!c1) {
-        c1 = strchr (c0, '\r'); // try \r for non-UNIX files (what do we do about a Mac? \n\r?)
+        c1 = strchr (c0, '\r'); // try \r for non-UNIX files
       }
       if (c1 == (char *) NULL) {
@@ -229 +236 @@
       }
       *c1 = 0; // mark the end of the line 
+      Nline_read ++;
+
+      if (Nline_read <= Nskip) { c0 = c1 + 1; continue; }
 
       if (*c0 == '#') { c0 = c1 + 1; continue; }