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

Timestamp:

Jun 4, 2015, 8:49:25 AM (11 years ago)

Author:

eugene

Message:

rice and gzip2 both work for images; working on tables

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

@@ -173 +173 @@
 
   // size of a pixel in the image tile -- this is probably not needed
-  // int tile_pixsize = abs(header[0].bitpix) / 8;
-  // fprintf (stderr, "raw_pixsize: %d, cmp_pixsize: %d, tile_pixsize: %d, raw_bitpix: %d\n", raw_pixsize, cmp_pixsize, tile_pixsize, raw_bitpix);
+# if VERBOSE_DUMP
+  int tile_pixsize = abs(header[0].bitpix) / 8;
+  fprintf (stderr, "raw_pixsize: %d, cmp_pixsize: %d, tile_pixsize: %d, raw_bitpix: %d\n", raw_pixsize, cmp_pixsize, tile_pixsize, raw_bitpix);
+# endif
 
   // allocate the buffer for compression work
@@ -210 +212 @@
 
     // gzip compresses bytes which are in BIG-ENDIAN order
+    // Nraw is number of pixels
     if (!strcasecmp(zcmptype, "GZIP_1")) {
-      // Nraw is number of pixels
       if (!gfits_byteswap_zdata (raw, Nraw * raw_pixsize, raw_pixsize)) ESCAPE;
     }
@@ -238 +240 @@
     // compression modes require swapping after compression (compresssion & decompression
     // operate on native ENDIAN)
-    if (strcasecmp(zcmptype, "GZIP_1") && strcasecmp(zcmptype, "GZIP_2")) {
+    if (strcasecmp(zcmptype, "GZIP_1") && strcasecmp(zcmptype, "GZIP_2") && strcasecmp(zcmptype, "RICE_1")) {
       // Nzdata is number of bytes
       if (!gfits_byteswap_zdata (zdata, Nzdata, cmp_pixsize)) ESCAPE;