Changeset 38340 for branches/eam_branches/ohana.20150429/src/libfits/matrix/F_uncompress_M.c

Timestamp:

May 30, 2015, 7:59:48 PM (11 years ago)

Author:

eugene

Message:

more work on compression : cfitsio assumes gzip, not zlib (I have made uncompress general )

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

@@ -249 +249 @@
   // size of a pixel in the output from the decompression routine
   odata_pixsize = gfits_uncompressed_data_pixsize (cmptype, header[0].bitpix, optname, optvalue, Noptions);
-  ALLOCATE (out, char, odata_pixsize*max_tile_size);
+
+  int Nout_alloc = odata_pixsize*max_tile_size;
+  ALLOCATE (out, char, Nout_alloc);
 
   off_t row;
@@ -258 +260 @@
 
     // expected output size for this tile
-    Nout = gfits_tile_size (matrix, otile, ztile);
+    // Nout = gfits_tile_size (matrix, otile, ztile);
+    Nout = Nout_alloc;
 
     zdata = gfits_varlength_column_pointer (ftable, &zdef, row, &Nzdata);
@@ -273 +276 @@
     // XXX the tile must not be > 2GB
     if (!gfits_uncompress_data ((char *)zdata, Nzdata, cmptype, optname, optvalue, Noptions, out, &Nout, odata_pixsize)) ESCAPE;
+
+    if (!strcasecmp(cmptype, "GZIP_1")) {
+      if (!gfits_byteswap_zdata (out, Nout, odata_pixsize)) ESCAPE;
+    }
 
     // copy the uncompressed pixels into their correct locations            
@@ -387 +394 @@
         SETUP_INSIZE (int, 4);
         break;
+      case 8:
+        SETUP_INSIZE (double, 8);
+        break;
       default:
         abort();