Changeset 38408 for branches/eam_branches/ohana.20150429/src/libfits/table/F_compress_T.c

Timestamp:

Jun 6, 2015, 10:04:55 AM (11 years ago)

Author:

eugene

Message:

fix AUTO types to match funpack needs; swap double correctly

File:

• branches/eam_branches/ohana.20150429/src/libfits/table/F_compress_T.c (modified) (3 diffs)

branches/eam_branches/ohana.20150429/src/libfits/table/F_compress_T.c

@@ -129 +129 @@
 
     if (!strcasecmp (fields[i].zctype, "AUTO")) {
-      if (!strcmp (fields[i].datatype, "float") || 
+      if (!strcmp (fields[i].datatype, "short") ||
+          !strcmp (fields[i].datatype, "float") || 
           !strcmp (fields[i].datatype, "double")|| 
           !strcmp (fields[i].datatype, "int64_t")) {
@@ -135 +136 @@
         goto got_cmptype;
       }
-      if (!strcmp (fields[i].datatype, "byte") ||
-          !strcmp (fields[i].datatype, "short") ||
-          !strcmp (fields[i].datatype, "int")) {
+      if (!strcmp (fields[i].datatype, "int")) {
         strcpy (fields[i].zctype, "RICE_1");
         goto got_cmptype;
       }
-      if (!strcmp (fields[i].datatype, "char")) {
+      if (!strcmp (fields[i].datatype, "byte") ||
+          !strcmp (fields[i].datatype, "char")) {
         strcpy (fields[i].zctype, "GZIP_1");
         goto got_cmptype;
@@ -154 +154 @@
         strcpy (fields[i].zctype, "GZIP_2");
       }
+    }
+
+    // OVERRIDE: GZIP_2 invalid for B (use GZIP_1)
+    if (!strcasecmp (fields[i].zctype, "GZIP_2") && !strcmp (fields[i].datatype, "byte")) {
+      strcpy (fields[i].zctype, "GZIP_1");
     }