Changeset 15656 for trunk/Ohana/src/libfits/matrix/F_uncompress_data.c

Timestamp:

Nov 20, 2007, 12:09:06 AM (19 years ago)

Author:

eugene

Message:

working on decompress

File:

• trunk/Ohana/src/libfits/matrix/F_uncompress_data.c (modified) (4 diffs)

trunk/Ohana/src/libfits/matrix/F_uncompress_data.c

@@ -26 +26 @@
   static int Noutsum = 0;
 
-  if (!strcasecmp(cmptype, "GZIP")) {
-    unsigned long tNout = *Nout;
+  if (!strcasecmp(cmptype, "GZIP_1")) {
+    unsigned long tNout = *Nout * out_pixsize;
     // uncompress does not require us to know the expected number of pixel; it tells us the number
     status = uncompress ((Bytef *) outdata, &tNout, (Bytef *) zdata, Nzdata);
@@ -38 +38 @@
   }
 
-  if (!strcasecmp(cmptype, "RICE") || !strcasecmp(cmptype, "RICE_1")) {
+  if (!strcasecmp(cmptype, "RICE_1")) {
     int i, blocksize;
     // look for the BLOCKSIZE
@@ -69 +69 @@
   }
   
-  if (!strcasecmp(cmptype, "PLIO")) {
+  if (!strcasecmp(cmptype, "PLIO_1")) {
     int Npix;
-    Npix = pl_l2pi ((short *) zdata, 0, (int *) outdata, *Nout);
+    Npix = pl_l2pi ((short *) zdata, 1, (int *) outdata, *Nout);
     if (Npix != *Nout) {
       fprintf (stderr, "error in plio decompression\n");
@@ -79 +79 @@
   }
 
-  if (!strcasecmp(cmptype, "HCOMPRESS")) {
+  if (!strcasecmp(cmptype, "HCOMPRESS_1")) {
     int Nx, Ny, scale;
     status = 0;