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

Timestamp:

Jun 12, 2015, 6:18:23 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM dev branch ohana.20150429

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libfits/matrix/F_uncompress_data.c (modified) (2 diffs)

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

@@ -26 +26 @@
 int gfits_uncompress (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen);
 
-int gfits_uncompress_data (char *zdata, int Nzdata, char *cmptype, char **optname, char **optvalue, int Nopt, char *outdata, int *Nout, int out_pixsize) {
+# define ESCAPE(RET) { fprintf (stderr, "gzip error in %s @ %s:%d\n", __func__, __FILE__, __LINE__); return (RET); }
+
+int gfits_uncompress_data (char *zdata, int Nzdata, char *cmptype, char **optname, char **optvalue, int Nopt, char *outdata, int *Nout, int Nout_alloc, int out_pixsize) {
 
   int status;
-  static int Ninsum = 0;
-  static int Noutsum = 0;
 
-  if (!strcasecmp(cmptype, "GZIP_1")) {
-    unsigned long tNout = *Nout * out_pixsize;
+  // do not actually uncompress : this is used for testing
+  if (!strcasecmp(cmptype, "NONE") || !strcasecmp(cmptype, "NONE_1") || !strcasecmp(cmptype, "NONE_2")) {
+    memcpy (outdata, zdata, Nzdata);
+    myAssert (*Nout == Nzdata, "invalid size");
+    *Nout = Nzdata / out_pixsize;
+    return (TRUE);
+  }
+
+  if (!strcasecmp(cmptype, "GZIP_1") || !strcasecmp(cmptype, "GZIP_2")) {
+    // unsigned long tNout = *Nout * out_pixsize;
+    // input value of *Nout is number of BYTES
+    unsigned long tNout = Nout_alloc;
 
     // for GZIP data, I need to check for and remove the header on the first block:
-    gfits_gz_stripheader ((unsigned char *)zdata, &Nzdata);
+    // XXX maybe not anymore
+    // gfits_gz_stripheader ((unsigned char *)zdata, &Nzdata);
 
     // uncompress does not require us to know the expected number of pixel; it tells us the number
+    // XXX shouldn't we validate the result : we think we know the size
     status = gfits_uncompress ((Bytef *) outdata, &tNout, (Bytef *) zdata, Nzdata);
-    if (status != Z_OK) {
-      fprintf (stderr, "error in uncompress (GZIP)\n");
-      return (FALSE);
-    }
+    if (status != Z_OK) ESCAPE(FALSE);
+    myAssert (*Nout == tNout, "uncompressed size mismatch");
     *Nout = tNout / out_pixsize;
+    // output value of *Nout is number of PIXELS
 
     // the resulting uncompressed data is byteswapped
-    if (!gfits_byteswap_zdata (outdata, *Nout, out_pixsize)) return (FALSE);
+    // if (!gfits_byteswap_zdata (outdata, *Nout, out_pixsize)) return (FALSE);
 
     return (TRUE);
   }
 
-  if (!strcasecmp(cmptype, "RICE_1")) {
+  if (!strcasecmp(cmptype, "RICE_1") || !strcasecmp(cmptype, "RICE_ONE")) {
     int i, blocksize;
     // look for the BLOCKSIZE
@@ -66 +77 @@
     }
 
-    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;
   }