Changeset 38415 for branches/eam_branches/ohana.20150429/src/libfits/table/F_compress_T.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/table/F_compress_T.c (modified) (2 diffs)

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

@@ -39 +39 @@
   if (!ztilelen) ztilelen = srcheader->Naxis[1];
 
-  if (srcheader->Naxis[1] % ztilelen) {
-    Ntile = srcheader->Naxis[1] / ztilelen + 1;
-    ztilelast = srcheader->Naxis[1] % ztilelen;
+  if (!srcheader->Naxis[1]) {
+    Ntile = 0;
+    ztilelast = 0;
   } else {
-    Ntile = srcheader->Naxis[1] / ztilelen;
+    if (srcheader->Naxis[1] % ztilelen) {
+      Ntile = srcheader->Naxis[1] / ztilelen + 1;
+      ztilelast = srcheader->Naxis[1] % ztilelen;
+    } else {
+      Ntile = srcheader->Naxis[1] / ztilelen;
     ztilelast = ztilelen;
+    }
   }
 
@@ -237 +242 @@
       }
 
-      if (strcasecmp(fields[j].zctype, "NONE") &&
-          strcasecmp(fields[j].zctype, "NONE_2") &&
+      if (strcasecmp(fields[j].zctype, "NONE_2") && // NONE and NONE_1 not swapped?
           strcasecmp(fields[j].zctype, "GZIP_1") &&
           strcasecmp(fields[j].zctype, "GZIP_2") &&