Changeset 38340 for branches/eam_branches/ohana.20150429/src/libfits/matrix/F_compress_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_compress_M.c (modified) (3 diffs)

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

@@ -139 +139 @@
   int tile_pixsize = gfits_uncompressed_data_pixsize (zcmptype, header[0].bitpix, NULL, NULL, 0);
 
+  int Nzdata_alloc = raw_pixsize*max_tile_size + 100;
   ALLOCATE (raw,   char, raw_pixsize*max_tile_size);
-  ALLOCATE (zdata, char, raw_pixsize*max_tile_size);
+  ALLOCATE (zdata, char, Nzdata_alloc);
 
   // init the otile[] counters
@@ -155 +156 @@
     if (!gfits_collect_data (matrix, raw, Nraw, raw_pixsize, otile, oblank, ztile, zblank, zscale, zzero)) ESCAPE(A);
 
+    if (!strcasecmp(zcmptype, "GZIP_1")) {
+      if (!gfits_byteswap_zdata (raw, Nraw, raw_pixsize)) ESCAPE(A);
+    }
+
     // XXX the tile must not be > 2GB
    
     // optname, optvalue = NULL, Noptions = 0
 
-    int Nzdata = raw_pixsize*max_tile_size; // available space, replaced with actual output size on compression
+    int Nzdata = Nzdata_alloc; // available space, replaced with actual output size on compression
     if (!gfits_compress_data (zdata, &Nzdata, zcmptype, NULL, NULL, 0, raw, Nraw, tile_pixsize)) ESCAPE(A);
 
@@ -298 +303 @@
         SETUP_INSIZE (int, 4);
         break;
+      case 8:
+        SETUP_INSIZE (double, 8);
+        break;
       default:
         abort();