Changeset 41433 for trunk/Ohana/src/libfits/table/F_get_column.c

Timestamp:

Nov 10, 2020, 1:26:09 PM (6 years ago)

Author:

eugene

Message:

small ascii table changes

File:

• trunk/Ohana/src/libfits/table/F_get_column.c (modified) (4 diffs)

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

@@ -318 +318 @@
 
 /***********************/
-int gfits_get_table_column_type (Header *header, char *label, char *type) {
-
-  int i, N, Nfields, Nval, Nbytes;
+int gfits_get_table_column_type (Header *header, char *label, char *type, int *Nval) {
+
+  int i, N, Nfields, Nbytes;
   char tlabel[256], field[256], format[256];
 
@@ -340 +340 @@
   gfits_scan (header, field, "%s", 1, format);
 
-  if (!gfits_table_format (format, type, &Nval, &Nbytes)) return (FALSE);
+  if (!gfits_table_format (format, type, Nval, &Nbytes)) return (FALSE);
+  *Nval = 1;
+
   return (TRUE);
 }
@@ -404 +406 @@
     for (i = 0; i < Ny; i++, Pin+=Nx, Pout+=4) {
       memcpy (line, Pin, Nval*Nbytes);
-      sscanf (line, "%d", (int *)Pout);
+      sscanf (line, cformat, (int *)Pout);
     }
   }
@@ -420 +422 @@
     for (i = 0; i < Ny; i++, Pin+=Nx, Pout+=4) {
       memcpy (line, Pin, Nval*Nbytes);
-      sscanf (line, "%f", (float *)Pout);
+      sscanf (line, cformat, (float *)Pout);
     }
   }