Changeset 41474 for trunk/Ohana/src/libfits/table/F_table_format.c

Timestamp:

Jan 24, 2021, 3:37:52 PM (5 years ago)

Author:

eugene

Message:

clarify in comments the buffers and pixel sizes used in the different stages of compression/uncompression; catch unimplemented compression cases; fix error in pixel size for RICE1; cleanup verbose code; use correct sscanf format code in ASCII table reading code

File:

• trunk/Ohana/src/libfits/table/F_table_format.c (modified) (3 diffs)

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

@@ -92 +92 @@
 int gfits_table_format (char *format, char *type, int *Nval, int *Nbytes) {
 
-  char Fchar, Size[80], Type;
+  char Fchar, Size[80];
   int Nv;
 
@@ -107 +107 @@
   }
   
-  Type = 'x';
-  if (Fchar == 'D') { *Nbytes = 1;  strcpy (type, "double"); Type = 'e'; *Nval = Nv; }
+  int isLong = FALSE;
+  char Type = 'x';
+  if (Fchar == 'D') { *Nbytes = 1;  strcpy (type, "double"); Type = 'e'; *Nval = Nv; isLong = TRUE; }
   if (Fchar == 'E') { *Nbytes = 1;  strcpy (type, "float");  Type = 'e'; *Nval = Nv; }
   if (Fchar == 'F') { *Nbytes = 1;  strcpy (type, "float");  Type = 'f'; *Nval = Nv; }
@@ -115 +116 @@
   if (!*Nbytes) { return (FALSE); }
   
-  sprintf (format, "%%-%s%c", Size, Type); // NOTE: this line is not used 
+  if (0) {
+    // this format is appropriate for scanning, but not printing
+    if (isLong) {
+      sprintf (format, "%%%sl%c", Size, Type);
+    } else {
+      sprintf (format, "%%%s%c", Size, Type);
+    }
+  }
+  
+  // this format is appropriate for printing, but not scanning
+  sprintf (format, "%%-%s%c", Size, Type);
 
   return (TRUE);