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

Timestamp:

May 28, 2015, 8:27:00 PM (11 years ago)

Author:

eugene

Message:

adding code for table compress/uncompress; image compress works (but is not quite compatible with cfitsio for some reason and byteswap is broken)

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

@@ -26 +26 @@
 int gfits_uncompress (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen);
 
+static int pass = 0;
+
 int gfits_uncompress_data (char *zdata, int Nzdata, char *cmptype, char **optname, char **optvalue, int Nopt, char *outdata, int *Nout, int out_pixsize) {
 
@@ -36 +38 @@
 
     // 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);
+
+    if (pass == 0) {
+      int i;
+      for (i = 0; i < 32; i++) {
+        fprintf (stderr, "0x%02hhx ", zdata[i]);
+      }
+      fprintf (stderr, "\n");
+      pass = 1;
+    }
 
     // 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) {
@@ -47 +60 @@
 
     // 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);