Changeset 41676 for trunk/Ohana/src/libfits/table/F_set_column.c

Timestamp:

Jul 1, 2021, 1:58:44 PM (5 years ago)

Author:

eugene

Message:

fix FITS ASCII column reading

File:

• trunk/Ohana/src/libfits/table/F_set_column.c (modified) (1 diff)

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

@@ -478 +478 @@
   /* print line with appropriate formatting */
   ALLOCATE (array, char, Nbytes*Nval*Nrow);
-  ALLOCATE (line, char, Nval+1);
+  ALLOCATE (line, char, Nbytes+1);
   Pin = data;
   Pout = array;
   if (!strcmp (type, "char")) {
-    for (i = 0; i < Nval*Nrow; i++, Pin++, Pout++) {
+    for (i = 0; i < Nbytes*Nval*Nrow; i++, Pin++, Pout++) {
       *Pout = *Pin;
     }
   }
   if (!strcmp (type, "int")) {
-    for (i = 0; i < Nrow; i++, Pin+=4, Pout+=Nval) {
-      snprintf (line, Nval + 1, cformat, *(int *)Pin);
-      memcpy (Pout, line, Nval);
+    for (i = 0; i < Nrow; i++, Pin+=4, Pout+=Nbytes) {
+      snprintf (line, Nbytes + 1, cformat, *(int *)Pin);
+      memcpy (Pout, line, Nbytes);
     }
   }
   if (!strcmp (type, "float")) {
-    for (i = 0; i < Nrow; i++, Pin+=4, Pout+=Nval) {
-      snprintf (line, Nval + 1, cformat, *(float *)Pin);
-      memcpy (Pout, line, Nval);
+    for (i = 0; i < Nrow; i++, Pin+=4, Pout+=Nbytes) {
+      snprintf (line, Nbytes + 1, cformat, *(float *)Pin);
+      memcpy (Pout, line, Nbytes);
     }
   }