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

Timestamp:

Feb 6, 2013, 3:20:55 PM (13 years ago)

Author:

eugene

Message:

add support for int64 columns in tables (was only partial in the past)

File:

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

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

@@ -96 +96 @@
   }
   if (!strcmp (type, "int64_t")) {
-    for (i = 0; i < Nval*Ny; i++, Pin+=Nbytes, Pout+=Nbytes) {
-# ifdef BYTE_SWAP
-      SWAP_DBLE;
-# endif
-      *(int64_t *)Pout = *(int64_t *)Pin*Bscale + Bzero;
+    if ((Bzero == 0.0) && (Bscale == 1.0)) {
+      for (i = 0; i < Nval*Ny; i++, Pin+=Nbytes, Pout+=Nbytes) {
+# ifdef BYTE_SWAP
+        SWAP_DBLE;
+# endif
+        *(int64_t *)Pout = *(int64_t *)Pin;
+      }
+    } else {
+      for (i = 0; i < Nval*Ny; i++, Pin+=Nbytes, Pout+=Nbytes) {
+# ifdef BYTE_SWAP
+        SWAP_DBLE;
+# endif
+        *(int64_t *)Pout = *(int64_t *)Pin*Bscale + Bzero;
+      }
     }
   }
@@ -243 +252 @@
   }
   if (!strcmp (type, "int64_t")) {
-    for (i = 0; i < Nval*Ny; i++, Pin+=Nbytes, Pout+=Nbytes) {
-# ifdef BYTE_SWAP
-      SWAP_DBLE;
-# endif
-      *(int64_t *)Pout = *(int64_t *)Pin*Bscale + Bzero;
+    // XXX 64 bit int operations with Bzero & Bscale are inaccurate even with doubles
+    if ((Bzero == 0.0) && (Bscale == 1.0)) {
+      for (i = 0; i < Nval*Ny; i++, Pin+=Nbytes, Pout+=Nbytes) {
+# ifdef BYTE_SWAP
+        SWAP_DBLE;
+# endif
+        *(int64_t *)Pout = *(int64_t *)Pin;
+      }
+    } else {
+      for (i = 0; i < Nval*Ny; i++, Pin+=Nbytes, Pout+=Nbytes) {
+# ifdef BYTE_SWAP
+        SWAP_DBLE;
+# endif
+        *(int64_t *)Pout = *(int64_t *)Pin*Bscale + Bzero;
+      }
     }
   }