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

Timestamp:

May 29, 2015, 5:24:53 PM (11 years ago)

Author:

eugene

Message:

table compression is internally consistent (tables can be generated and compressed)

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) {
 
@@ -33 +31 @@
   static int Ninsum = 0;
   static int Noutsum = 0;
+
+  // do not actually uncompress : this is used for testing
+  if (!strcasecmp(cmptype, "NONE")) {
+    memcpy (outdata, zdata, Nzdata);
+    *Nout = Nzdata / out_pixsize;
+    return (TRUE);
+  }
 
   if (!strcasecmp(cmptype, "GZIP_1")) {
@@ -40 +45 @@
     // 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