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

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

@@ -2 +2 @@
 # include <gfitsio.h>
 # include <zlib.h>
+# define VERBOSE_DUMP 0
 
 # define ESCAPE { \
@@ -242 +243 @@
   // zdata_pixsize = gfits_vartable_heap_pixsize (zdef.format); XXX
 
-  // size of a pixel in the final image (not needed)
-  // idata_pixsize = abs(header[0].bitpix) / 8;
-
   // size of a pixel in the output from the decompression routine
   int cmp_pixsize = gfits_compressed_data_pixsize (cmptype, header[0].bitpix, optname, optvalue, Noptions);
@@ -250 +248 @@
   int raw_pixsize = gfits_uncompressed_data_pixsize (cmptype, header[0].bitpix, optname, optvalue, Noptions);
 
+  // size of a pixel in the final image (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);
+
   int Nout_alloc = raw_pixsize*max_tile_size;
   ALLOCATE (out, char, Nout_alloc);
@@ -255 +257 @@
   off_t row;
 
-  if (0) { 
+  if (VERBOSE_DUMP) { 
     int k;
     fprintf (stderr, "unc tbl: "); 
@@ -273 +275 @@
     if (!zdata) ESCAPE;
 
-    if (strcasecmp(cmptype, "GZIP_1")) {
-      if (!gfits_byteswap_zdata (zdata, Nzdata, cmp_pixsize)) ESCAPE;
-    }
-
-    if (0 && (row == 0)) {
+    if (VERBOSE_DUMP && (row == 0)) {
       int k;
       fprintf (stderr, "unc dat: "); 
@@ -284 +282 @@
     }
 
+    if (strcasecmp(cmptype, "GZIP_1")) {
+      // Nzdata is number of bytes
+      if (!gfits_byteswap_zdata (zdata, Nzdata, cmp_pixsize)) ESCAPE;
+    }
+
+    if (VERBOSE_DUMP && (row == 0)) {
+      int k;
+      fprintf (stderr, "unc SWP: "); 
+      for (k = 0; k < 32; k++) { fprintf (stderr, "0x%02hhx ", zdata[k]); } 
+      fprintf (stderr, "\n");
+      fprintf (stderr, "Nout  : %d -> ", Nout);
+    }
+    
     // gfits_uncompress_data uncompresses from zdata to the temporary output buffer which must be allocated
     // 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 (0 && (row == 0)) {
+    if (VERBOSE_DUMP && (row == 0)) {
       int k;
+      fprintf (stderr, "%d\n", Nout);
       fprintf (stderr, "unc swp: "); 
       for (k = 0; k < 32; k++) { fprintf (stderr, "0x%02hhx ", out[k]); } 
@@ -296 +309 @@
     
     if (!strcasecmp(cmptype, "GZIP_1")) {
-      if (!gfits_byteswap_zdata (out, Nout, raw_pixsize)) ESCAPE;
+      // Nout is number of pixels
+      if (!gfits_byteswap_zdata (out, Nout * raw_pixsize, raw_pixsize)) ESCAPE;
     }
     
-    if (0 && (row == 0)) {
+    if (VERBOSE_DUMP && (row == 0)) {
       int k;
       fprintf (stderr, "unc raw: "); 
@@ -309 +323 @@
     if (!gfits_distribute_data (matrix, out, Nout, raw_bitpix, otile, oblank, ztile, zblank, zscale, zzero)) ESCAPE;
 
-    if (0 && (row == 0)) {
+    if (VERBOSE_DUMP && (row == 0)) {
       int k;
       fprintf (stderr, "unc mat: ");