Changeset 41474 for trunk/Ohana/src/libfits/table/F_get_column.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_get_column.c (modified) (1 diff)

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

@@ -403 +403 @@
   if (!strcmp (type, "int")) {
     ALLOCATE (array, char, Ny*4);
-    Pout = array;
-    for (i = 0; i < Ny; i++, Pin+=Nx, Pout+=4) {
+    int *tmpPtr = (int *)array;
+    for (i = 0; i < Ny; i++, Pin+=Nx, tmpPtr ++) {
       memcpy (line, Pin, Nval*Nbytes);
-      sscanf (line, cformat, (int *)Pout);
+      sscanf (line, "%d", tmpPtr);
+      // fprintf (stderr, "test: %d %d\n", Nscan, tmpValue);
     }
   }
   if (!strcmp (type, "int64_t")) {
     ALLOCATE (array, char, Ny*8);
-    Pout = array;
-    for (i = 0; i < Ny; i++, Pin+=Nx, Pout+=8) {
+    int64_t *tmpPtr = (int64_t *)array;
+    for (i = 0; i < Ny; i++, Pin+=Nx, tmpPtr ++) {
       memcpy (line, Pin, Nval*Nbytes);
-      sscanf (line, "%" PRId64, (int64_t *)Pout);
+      sscanf (line, "%" PRId64, tmpPtr);
     }
   }
   if (!strcmp (type, "float")) {
     ALLOCATE (array, char, Ny*4);
-    Pout = array;
-    for (i = 0; i < Ny; i++, Pin+=Nx, Pout+=4) {
+    float *tmpPtr = (float *) array;
+    for (i = 0; i < Ny; i++, Pin+=Nx, tmpPtr ++) {
       memcpy (line, Pin, Nval*Nbytes);
-      sscanf (line, cformat, (float *)Pout);
+      sscanf (line, "%e", tmpPtr);
+    }
+  }
+  if (!strcmp (type, "double")) {
+    ALLOCATE (array, char, Ny*8);
+    double *tmpPtr = (double *) array;
+    for (i = 0; i < Ny; i++, Pin+=Nx, tmpPtr++) {
+      memcpy (line, Pin, Nval*Nbytes);
+      sscanf (line, "%le", tmpPtr);
     }
   }