Changeset 38341 for branches/eam_branches/ohana.20150429/src/opihi/cmd.data/wd.c

Timestamp:

May 31, 2015, 8:36:04 AM (11 years ago)

Author:

eugene

Message:

fix up compressed fits table I/O; add lrand, mrand, drand functions

File:

• branches/eam_branches/ohana.20150429/src/opihi/cmd.data/wd.c (modified) (4 diffs)

branches/eam_branches/ohana.20150429/src/opihi/cmd.data/wd.c

@@ -3 +3 @@
 int wd (int argc, char **argv) {
   
-  int N, Extend, Compress;
+  int N, Extend;
   int newUnsign, newBitpix, newScale, newZero;
   int outUnsign, outBitpix;
@@ -18 +18 @@
   }
 
-  Compress = FALSE;
-  if ((N = get_argument (argc, argv, "-compress"))) {
-    remove_argument (N, &argc, argv);
-    Compress = TRUE;
-  }
-
   char *CompressMode = NULL;
   if ((N = get_argument (argc, argv, "-compress-mode"))) {
@@ -29 +23 @@
     CompressMode = strcreate(argv[N]);
     remove_argument (N, &argc, argv);
-  }
-  if (!CompressMode) CompressMode = strcreate("GZIP_1");
+  } else if ((N = get_argument (argc, argv, "-compress"))) {
+    remove_argument (N, &argc, argv);
+    CompressMode = strcreate("GZIP_1");
+  }
 
   outZero = 0;
@@ -180 +176 @@
   
   // not compatible with extend
-  if (Compress) {
+  if (CompressMode) {
     Header myHeader;
     Matrix myMatrix;