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

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

@@ -65 +65 @@
   }
 
-  if (!strcasecmp(cmptype, "RICE_1")) {
+  if (!strcasecmp(cmptype, "RICE_1") || !strcasecmp(cmptype, "RICE_ONE")) {
     int i, blocksize;
     // look for the BLOCKSIZE
@@ -83 +83 @@
     // fprintf (stderr, "%d comp bytes; %d uncomp 'pixels', totals: %d %d\n", Nzdata, Npix, Ninsum, Noutsum);
 
+    char buffer[1000];
+    int k;
+
     switch (rawpix_size) {
       case 4:
@@ -90 +93 @@
 
       case 2:
+        // Nout is the number of bytes in the compressed buffer
         Nout = fits_rcomp_short ((short *) rawdata, Nrawpix, (unsigned char *) zdata, *Nzdata, blocksize);
+
+        if (0) {
+          fprintf (stderr, "Nout: %d, Nrawpix: %d\n", Nout, Nrawpix);
+          fprintf (stderr, "cmp inp: "); 
+          for (k = 0; k < Nout; k++) { fprintf (stderr, "0x%02hhx ", zdata[k]); } 
+          fprintf (stderr, "\n");
+        }
+
+        status = fits_rdecomp_short ((unsigned char *) zdata, Nout, (unsigned short *) buffer, Nrawpix, blocksize);
+        myAssert (!status, "failed to rdecomp");
         break;