Changeset 38366 for branches/eam_branches/ohana.20150429/src/libfits/matrix/F_uncompress_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_uncompress_M.c (modified) (4 diffs)

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

@@ -271 +271 @@
 
     // expected output size for this tile
-    // Nout = gfits_tile_size (matrix, otile, ztile);
-    Nout = Nout_alloc;
+    Nout = raw_pixsize*gfits_tile_size (matrix, otile, ztile);
 
     zdata = gfits_varlength_column_pointer (ftable, &zdef, row, &Nzdata);
@@ -284 +283 @@
     }
 
-    if (strcasecmp(cmptype, "GZIP_1") && strcasecmp(cmptype, "GZIP_2") && strcasecmp(cmptype, "RICE_1")) {
+    if (strcasecmp(cmptype, "NONE") && 
+        strcasecmp(cmptype, "NONE_2") && 
+        strcasecmp(cmptype, "GZIP_1") && 
+        strcasecmp(cmptype, "GZIP_2") && 
+        strcasecmp(cmptype, "RICE_1") && 
+        strcasecmp(cmptype, "RICE_ONE")) {
       // Nzdata is number of bytes
       if (!gfits_byteswap_zdata (zdata, Nzdata, cmp_pixsize)) ESCAPE;
@@ -300 +304 @@
     // XXX the tile must not be > 2GB
     // Nout going in is number of bytes 
-    if (!gfits_uncompress_data ((char *)zdata, Nzdata, cmptype, optname, optvalue, Noptions, out, &Nout, raw_pixsize)) ESCAPE;
+    if (!gfits_uncompress_data ((char *)zdata, Nzdata, cmptype, optname, optvalue, Noptions, out, &Nout, Nout_alloc, raw_pixsize)) ESCAPE;
 
     if (VERBOSE_DUMP && (row == 0)) {
@@ -323 +327 @@
 
     // copy the uncompressed pixels into their correct locations            
-    if (!strcasecmp(cmptype, "GZIP_2")) {
+    if (!strcasecmp(cmptype, "GZIP_2") || !strcasecmp(cmptype, "NONE_2")) {
       if (!gfits_distribute_gzp2 (matrix, out, Nout, raw_bitpix, otile, oblank, ztile, zblank, zscale, zzero)) ESCAPE;
     } else {