Changeset 33648 for trunk/Ohana/src/libfits/matrix/F_read_portion.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_read_portion.c (modified) (2 diffs)

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

@@ -52 +52 @@
   fclose (f);
 
+# define DOSWAP(A,B) { char tmp = A; A = B; B = tmp; }
+
 # ifdef BYTE_SWAP  
   {
     off_t i;
     int perpix;
-    unsigned char *byte0, *byte1, *byte2, *byte3, *byte4, *byte5, *byte6, *byte7, ctmp;
-
+    unsigned char *byte0, *byte1, *byte2, *byte3, *byte4, *byte5, *byte6, *byte7;
+    
     perpix = abs(header.bitpix) / 8;
     if (perpix > 1) {
@@ -70 +72 @@
       if (perpix == 2) {
         for (i = 0; i < nbytes; i+=2, byte0 += 2, byte1 += 2) {
-          ctmp = *byte0;
-          *byte0 = *byte1;
-          *byte1 = ctmp;
+          DOSWAP(*byte0, *byte1);
         }
       }
       if (perpix == 4) {
         for (i = 0; i < nbytes; i+=4, byte0 += 4, byte1 += 4, byte2 += 4, byte3 += 4) {
-          ctmp = *byte0;
-          *byte0 = *byte3;
-          *byte3 = ctmp;
-          ctmp = *byte1;
-          *byte1 = *byte2;
-          *byte2 = ctmp;
+          DOSWAP (*byte0, *byte3);
+          DOSWAP (*byte1, *byte2);
         }
       }
       if (perpix == 8) {
         for (i = 0; i < nbytes; i+=8, byte0 += 8, byte1 += 8, byte2 += 8, byte3 += 8, byte4 += 8, byte5 += 8, byte6 += 8, byte7 += 8) {
-          ctmp = *byte0;
-          *byte0 = *byte7;
-          *byte7 = ctmp;
-          ctmp = *byte1;
-          *byte1 = *byte6;
-          *byte6 = ctmp;
-          ctmp = *byte1;
-          *byte2 = *byte5;
-          *byte5 = ctmp;
-          ctmp = *byte1;
-          *byte3 = *byte4;
-          *byte4 = ctmp;
+          DOSWAP (*byte0, *byte7);
+          DOSWAP (*byte1, *byte6);
+          DOSWAP (*byte2, *byte5);
+          DOSWAP (*byte3, *byte4);
         }
       }