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

Timestamp:

Jun 3, 2015, 7:00:55 AM (11 years ago)

Author:

eugene

Message:

get the input / output / compressed pixels sizes right and get the byteswaps right

File:

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

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

@@ -2 +2 @@
 # include <gfitsio.h>
 # include <zlib.h>
+# define VERBOSE_DUMP 0
 
 // the user needs to specify the various compression options:
@@ -33 +34 @@
 
   Header *theader = ftable->header;
+
+  if (!gfits_cmptype_valid(zcmptype)) ESCAPE;
 
   // determine the number of tiles (from ztile[] and image size)
@@ -147 +150 @@
   int max_tile_size = gfits_imtile_maxsize (matrix, ztile);
 
-  // size of a pixel in the image tile -- this is probably not needed
-  int tile_pixsize = abs(header[0].bitpix) / 8;
-
   // size of a pixel in the raw pixel buffer (before compression)
   int raw_pixsize = gfits_uncompressed_data_pixsize (zcmptype, header[0].bitpix, NULL, NULL, 0);
@@ -155 +155 @@
   int cmp_pixsize = gfits_compressed_data_pixsize (zcmptype, header[0].bitpix, NULL, NULL, 0);
 
-  fprintf (stderr, "raw_pixsize: %d, cmp_pixsize: %d, tile_pixsize: %d, raw_bitpix: %d\n", 
-           raw_pixsize, cmp_pixsize, tile_pixsize, raw_bitpix);
+  // 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);
 
   // allocate the buffer for compression work
@@ -177 +178 @@
     if (!gfits_collect_data (matrix, raw, Nraw, raw_bitpix, otile, oblank, ztile, zblank, zscale, zzero)) ESCAPE;
 
-    if (0 && (i == 0)) {
+    if (VERBOSE_DUMP && (i == 0)) {
       int k;
       fprintf (stderr, "cmp mat: "); 
@@ -189 +190 @@
     // gzip compresses bytes which are in BIG-ENDIAN order
     if (!strcasecmp(zcmptype, "GZIP_1")) {
-      if (!gfits_byteswap_zdata (raw, Nraw, raw_pixsize)) ESCAPE;
-    }
-    if (0 && (i == 0)) {
+      // Nraw is number of pixels
+      if (!gfits_byteswap_zdata (raw, Nraw * raw_pixsize, raw_pixsize)) ESCAPE;
+    }
+    int Nzdata = Nzdata_alloc; // available space, replaced with actual output size on compression
+
+    if (VERBOSE_DUMP && (i == 0)) {
       int k;
       fprintf (stderr, "cmp swp: "); 
       for (k = 0; k < 32; k++) { fprintf (stderr, "0x%02hhx ", raw[k]); } 
       fprintf (stderr, "\n");
+      fprintf (stderr, "Nzdata: %d -> ", Nzdata);
     }
 
     // optname, optvalue = NULL, Noptions = 0 : defaults for RICE_1, HCOMPRESS_1
 
-    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, raw_pixsize, ztile[1], ztile[0])) ESCAPE;
-    if (0 && (i == 0)) {
+    if (VERBOSE_DUMP && (i == 0)) {
+      int k;
+      fprintf (stderr, "%d\n", Nzdata);
+      fprintf (stderr, "cmp SWP: "); 
+      for (k = 0; k < 32; k++) { fprintf (stderr, "0x%02hhx ", zdata[k]); } 
+      fprintf (stderr, "\n");
+    }
+
+    // all other compression modes require swapping after compression
+    // (compresssion & decompression operate on native ENDIAN)
+    if (strcasecmp(zcmptype, "GZIP_1")) {
+      // Nzdata is number of bytes
+      if (!gfits_byteswap_zdata (zdata, Nzdata, cmp_pixsize)) ESCAPE;
+    }
+
+    if (VERBOSE_DUMP && (i == 0)) {
       int k;
       fprintf (stderr, "cmp dat: "); 
@@ -208 +227 @@
       fprintf (stderr, "\n");
     }
-
     if (!gfits_varlength_column_add_data (ftable, zdata, Nzdata, i, &zdef)) ESCAPE;
-
-    // all other compression modes require swapping after compression
-    // (compresssion & decompression operate on native ENDIAN)
-    if (strcasecmp(zcmptype, "GZIP_1")) {
-      if (!gfits_byteswap_zdata (zdata, Nzdata, cmp_pixsize)) ESCAPE;
-    }
 
     // update the otile[] counters, carrying to the next dimension if needed
@@ -222 +234 @@
 
   if (!gfits_varlength_column_finish (ftable, &zdef)) ESCAPE;
-  if (0) { 
+  if (VERBOSE_DUMP) { 
     int k;
     fprintf (stderr, "cmp tbl: ");