Changeset 39465

Timestamp:

Mar 14, 2016, 4:06:29 PM (10 years ago)

Author:

eugene

Message:

byteswap column after reading compressed data

Location:

trunk/Ohana/src/tools

Files:

• Makefile (modified) (1 diff)
• src/ftable.c (modified) (3 diffs)

trunk/Ohana/src/tools/Makefile

@@ -77 +77 @@
         rm -f `find . -name "*~"`
         rm -f `find . -name "#*"`
+        rm -f $(BIN)/*.$(ARCH)
 
 dist: clean

trunk/Ohana/src/tools/src/ftable.c

@@ -582 +582 @@
   
   gfits_free_header (&header);
-  gfits_free_table (&ftable);
+  gfits_free_matrix (&matrix);
   
   int Nextend = 0;
@@ -612 +612 @@
         myQuit ("failed to uncompress table for extension #%d from input file %s\n", Nextend, argv[1]);
       
+      for (i = 0; i < Nfields; i++) {
+        if (!gfits_byteswap_bintable_column (&rawtable, i+1)) 
+          myQuit ("cannot swap table column for extension #%d from input file %s\n", Nextend, argv[1]);
+      }
+
       outheader = &rawheader;
       outtable  = &rawtable;
       gfits_free_header (&header);
-      gfits_free_table (&ftable);
+      gfits_free_table  (&ftable);
     }
 
@@ -632 +637 @@
     Nextend ++;
   }
-
-  if (!fclose (fi)) myQuit ("error closing input file %s\n", argv[1]);
-  if (!fclose (fo)) myQuit ("error closing output file %s\n", argv[1]);
+  if (fclose (fi)) myQuit ("error closing input file %s\n", argv[1]);
+  if (fclose (fo)) myQuit ("error closing output file %s\n", argv[1]);
+
+  fprintf (stderr, "copied %d extensions from %s into %s\n", Nextend, argv[1], argv[2]);
+
   exit (0);
 }