Changeset 33648 for trunk/Ohana/src/libfits/matrix/F_compress_M.c

Timestamp:

Apr 1, 2012, 2:22:08 PM (14 years ago)

Author:

eugene

Message:

fix byteswap error for 64bit tables (simplify byteswap code generally to clean up); add function to get type of specified column by seq number; defaults for Bzero and Bscale in tables without temp (0.0,1.0); function to set a bintable column from a vector of different type; better error handling for F_print,F_modify

File:

• trunk/Ohana/src/libfits/matrix/F_compress_M.c (modified) (4 diffs)

trunk/Ohana/src/libfits/matrix/F_compress_M.c

@@ -424 +424 @@
 int gfits_byteswap_zdata (char *zdata, int Nzdata, int pixsize) {
 
+# define DOSWAP(A,B) { char tmp = A; A = B; B = tmp; }
+
 # ifdef BYTE_SWAP
 
   int i;
-  char tmp;
 
   switch (pixsize) {
@@ -435 +436 @@
     case 2:
       for (i = 0; i < 2*Nzdata; i+=2) {
-        tmp = zdata[i];
-        zdata[i] = zdata[i+1];
-        zdata[i+1] = tmp;
+        DOSWAP (zdata[i+0], zdata[i+1]);
       }
       break;
@@ -443 +442 @@
     case 4:
       for (i = 0; i < 4*Nzdata; i+=4) {
-        tmp = zdata[i+1];
-        zdata[i+1] = zdata[i+2];
-        zdata[i+2] = tmp;
-        tmp = zdata[i];
-        zdata[i] = zdata[i+3];
-        zdata[i+3] = tmp;
+        DOSWAP (zdata[i+0], zdata[i+3]);
+        DOSWAP (zdata[i+1], zdata[i+2]);
       }
       break;
@@ -454 +449 @@
     case 8:
       for (i = 0; i < 8*Nzdata; i+=8) {
-        tmp = zdata[i+0];
-        zdata[i+0] = zdata[i+7];
-        zdata[i+7] = tmp;
-        tmp = zdata[i+1];
-        zdata[i+1] = zdata[i+6];
-        zdata[i+6] = tmp;
-        tmp = zdata[i+2];
-        zdata[i+2] = zdata[i+5];
-        zdata[i+5] = tmp;
-        tmp = zdata[i+3];
-        zdata[i+3] = zdata[i+4];
-        zdata[i+4] = tmp;
+        DOSWAP (zdata[i+0], zdata[i+7]);
+        DOSWAP (zdata[i+1], zdata[i+6]);
+        DOSWAP (zdata[i+2], zdata[i+5]);
+        DOSWAP (zdata[i+3], zdata[i+4]);
       }
       break;