Changeset 38366 for branches/eam_branches/ohana.20150429/src/libfits/matrix/F_uncompress_data.c

Timestamp:

Jun 4, 2015, 5:42:47 PM (11 years ago)

Author:

eugene

Message:

libfits compressed I/O seems to be generally working

File:

• branches/eam_branches/ohana.20150429/src/libfits/matrix/F_uncompress_data.c (modified) (3 diffs)

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

@@ -28 +28 @@
 # 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 out_pixsize) {
+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;
 
   // do not actually uncompress : this is used for testing
-  if (!strcasecmp(cmptype, "NONE")) {
+  if (!strcasecmp(cmptype, "NONE") || !strcasecmp(cmptype, "NONE_2")) {
     memcpy (outdata, zdata, Nzdata);
+    myAssert (*Nout == Nzdata, "invalid size");
     *Nout = Nzdata / out_pixsize;
     return (TRUE);
@@ -42 +43 @@
     // unsigned long tNout = *Nout * out_pixsize;
     // input value of *Nout is number of BYTES
-    unsigned long tNout = *Nout;
+    unsigned long tNout = Nout_alloc;
 
     // for GZIP data, I need to check for and remove the header on the first block:
@@ -52 +53 @@
     status = gfits_uncompress ((Bytef *) outdata, &tNout, (Bytef *) zdata, Nzdata);
     if (status != Z_OK) ESCAPE(FALSE);
+    myAssert (*Nout == tNout, "uncompressed size mismatch");
     *Nout = tNout / out_pixsize;
     // output value of *Nout is number of PIXELS