Changeset 38415 for branches/eam_branches/ohana.20150429/src/libfits/matrix/F_compress_utils.c

Timestamp:

Jun 6, 2015, 2:28:50 PM (11 years ago)

Author:

eugene

Message:

add timing test; handle empty table

File:

• branches/eam_branches/ohana.20150429/src/libfits/matrix/F_compress_utils.c (modified) (4 diffs)

branches/eam_branches/ohana.20150429/src/libfits/matrix/F_compress_utils.c

@@ -173 +173 @@
 int gfits_cmptype_valid (char *cmptype) {
 
-  if (!strcasecmp(cmptype, "NONE")) return TRUE;
+  if (!strcasecmp(cmptype, "NONE"))   return TRUE;
+  if (!strcasecmp(cmptype, "NONE_1")) return TRUE; // do not compress, but shuffle a la GZIP_1
   if (!strcasecmp(cmptype, "NONE_2")) return TRUE; // do not compress, but shuffle a la GZIP_2
   if (!strcasecmp(cmptype, "GZIP_1")) return TRUE;
@@ -192 +193 @@
       !strcasecmp(cmptype, "GZIP_2") || 
       !strcasecmp(cmptype, "NONE_2") || 
+      !strcasecmp(cmptype, "NONE_1") || 
       !strcasecmp(cmptype, "NONE")) {
     if (out_bitpix ==   8) return (1);
@@ -235 +237 @@
 
   // NONE should be swapped to mimic swapping types
-  if (!strcasecmp(cmptype, "NONE")) {
+  if (!strcasecmp(cmptype, "NONE") || !strcasecmp(cmptype, "NONE_1")) {
     if (out_bitpix ==   8) return (1);
     if (out_bitpix ==  16) return (2);
@@ -292 +294 @@
   if (!strcasecmp(cmptype, "GZIP_1") || 
       !strcasecmp(cmptype, "GZIP_2") || 
+      !strcasecmp(cmptype, "NONE_1") || 
       !strcasecmp(cmptype, "NONE_2") || 
       !strcasecmp(cmptype, "NONE")) {