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

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

@@ -31 +31 @@
 
   int status;
-  static int Ninsum = 0;
-  static int Noutsum = 0;
 
   // do not actually uncompress : this is used for testing
@@ -42 +40 @@
 
   if (!strcasecmp(cmptype, "GZIP_1")) {
-    unsigned long tNout = *Nout * out_pixsize;
+    // unsigned long tNout = *Nout * out_pixsize;
+    // input value of *Nout is number of BYTES
+    unsigned long tNout = *Nout;
 
     // for GZIP data, I need to check for and remove the header on the first block:
@@ -53 +53 @@
     if (status != Z_OK) ESCAPE(FALSE);
     *Nout = tNout / out_pixsize;
+    // output value of *Nout is number of PIXELS
 
     // the resulting uncompressed data is byteswapped
@@ -60 +61 @@
   }
 
-  if (!strcasecmp(cmptype, "RICE_1")) {
+  if (!strcasecmp(cmptype, "RICE_1") || !strcasecmp(cmptype, "RICE_ONE")) {
     int i, blocksize;
     // look for the BLOCKSIZE
@@ -74 +75 @@
     }
 
-    int Npix;
-    // Npix = *Nout * (out_pixsize / 4.0);
-    Npix = *Nout;
-
-    Ninsum += Nzdata;
-    Noutsum += *Nout;
-    // fprintf (stderr, "%d comp bytes; %d uncomp 'pixels', totals: %d %d\n", Nzdata, Npix, Ninsum, Noutsum);
+    int status = FALSE;
+    int Npix = *Nout / out_pixsize;
+    int k;
 
     switch (out_pixsize) {
       case 4:
         // rice decompression from the CFITSIO source tree : we need to tell it the expected number of pixels
-        // is also REQUIRES 4byte output, which is fairly stupid.
-        if (fits_rdecomp ((unsigned char *) zdata, Nzdata, (unsigned int *) outdata, Npix, blocksize)) {
-          fprintf (stderr, "error in rice decompression\n");
-          return (FALSE);
+        status = fits_rdecomp ((unsigned char *) zdata, Nzdata, (unsigned int *) outdata, Npix, blocksize);
+        break;
+      case 2:
+        if (0) {
+          fprintf (stderr, "Nout: %d, Nrawpix: %d\n", Nzdata, Npix);
+          fprintf (stderr, "cmp out: "); 
+          for (k = 0; k < Nzdata; k++) { fprintf (stderr, "0x%02hhx ", zdata[k]); } 
+          fprintf (stderr, "\n");
         }
-        return (TRUE);
-
-      case 2:
-        if (fits_rdecomp_short ((unsigned char *) zdata, Nzdata, (unsigned short *) outdata, Npix, blocksize)) {
-          fprintf (stderr, "error in rice decompression\n");
-          return (FALSE);
-        }
-        return (TRUE);
-
+        status = fits_rdecomp_short ((unsigned char *) zdata, Nzdata, (unsigned short *) outdata, Npix, blocksize);
+        break;
       case 1:
-        if (fits_rdecomp_byte ((unsigned char *) zdata, Nzdata, (unsigned char *) outdata, Npix, blocksize)) {
-          fprintf (stderr, "error in rice decompression\n");
-          return (FALSE);
-        }
-        return (TRUE);
-        
+        status = fits_rdecomp_byte ((unsigned char *) zdata, Nzdata, (unsigned char *) outdata, Npix, blocksize);
+        break;
       default:
         fprintf (stderr, "invalid output pixel size %d\n", out_pixsize);
-        return (FALSE);
+        status = FALSE;
+        break;
     }
-    
+    if (status) {
+      *Nout = 0;
+      return FALSE;
+    }
+    *Nout = Npix;
+    return TRUE;
   }