Changeset 38366 for branches/eam_branches/ohana.20150429/src/libfits/matrix/F_compress_M.c

Timestamp:

Jun 4, 2015, 5:42:47 PM (11 years ago)

Author:

eugene

Message:

libfits compressed I/O seems to be generally working

File:

• branches/eam_branches/ohana.20150429/src/libfits/matrix/F_compress_M.c (modified) (3 diffs)

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

@@ -165 +165 @@
 
   // define compression-specific keywords, update header as needed.
-  if (!strcasecmp(zcmptype, "RICE_1")) {
+  if (!strcasecmp(zcmptype, "RICE_1") || !strcasecmp(zcmptype, "RICE_ONE")) {
     if (!gfits_modify (theader, "ZNAME1", "%s", 1, "BLOCKSIZE")) ESCAPE;
     if (!gfits_modify (theader, "ZVAL1", "%d", 1, 32)) ESCAPE;
@@ -195 +195 @@
     // copy the raw pixels from their native matrix locations to the temporary output buffer
     // for float -> int scaling by zscale, zzero may be applied
-    if (!strcasecmp (zcmptype, "GZIP_2")) {
+    if (!strcasecmp (zcmptype, "GZIP_2") || !strcasecmp (zcmptype, "NONE_2")) {
       if (!gfits_collect_gzp2 (matrix, raw, Nraw, raw_bitpix, otile, oblank, ztile, zblank, zscale, zzero)) ESCAPE;
     } else {
@@ -240 +240 @@
     // compression modes require swapping after compression (compresssion & decompression
     // operate on native ENDIAN)
-    if (strcasecmp(zcmptype, "GZIP_1") && strcasecmp(zcmptype, "GZIP_2") && strcasecmp(zcmptype, "RICE_1")) {
+    if (strcasecmp(zcmptype, "NONE") && 
+        strcasecmp(zcmptype, "NONE_2") && 
+        strcasecmp(zcmptype, "GZIP_1") && 
+        strcasecmp(zcmptype, "GZIP_2") && 
+        strcasecmp(zcmptype, "RICE_1") && 
+        strcasecmp(zcmptype, "RICE_ONE")) {
       // Nzdata is number of bytes
       if (!gfits_byteswap_zdata (zdata, Nzdata, cmp_pixsize)) ESCAPE;