Changeset 38334 for branches/eam_branches/ohana.20150429/src/libfits/matrix/F_compress_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_compress_data.c (modified) (3 diffs)

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

@@ -27 +27 @@
 int gfits_compress (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen);
 
-static int pass = 0;
-
 int gfits_compress_data (char *zdata, int *Nzdata, char *cmptype, 
                          char **optname, char **optvalue, int Nopt, 
@@ -34 +32 @@
 
   int status;
+
+  // do not actually compress : this is used for testing
+  if (!strcasecmp(cmptype, "NONE")) {
+    unsigned long Nbytes = Nrawpix * rawpix_size;
+
+    memcpy (zdata, rawdata, Nbytes);
+    *Nzdata = Nbytes;
+    return (TRUE);
+  }
 
   if (!strcasecmp(cmptype, "GZIP_1")) {
@@ -49 +56 @@
       fprintf (stderr, "error in compress (GZIP)\n");
       return (FALSE);
-    }
-
-    // test of deflate (vs I/O)
-    { 
-      char *srcbuf, *tgtbuf;
-      ALLOCATE (srcbuf, char, destLen);
-      memcpy (srcbuf, zdata, destLen);
-
-      ALLOCATE (tgtbuf, char, Nbytes);
-      
-      uLongf Ndeflate = Nbytes;
-      status = gfits_uncompress ((Bytef *) tgtbuf, &Ndeflate, (Bytef *) zdata, destLen);
-      if (status != Z_OK) {
-        fprintf (stderr, "error in uncompress (GZIP) : %d vs %d\n", status, Z_OK);
-        return (FALSE);
-      }
-      
-      myAssert (Ndeflate == Nbytes, "invalid output size?");
-
-      int i; 
-      for (i = 0; i < Ndeflate; i++) {
-        myAssert (rawdata[i] == tgtbuf[i], "data mismatch?");
-      }
-
-    }
-
-    if (pass == 0) {
-      int i;
-      for (i = 0; i < 32; i++) {
-        fprintf (stderr, "0x%02hhx ", zdata[i]);
-      }
-      fprintf (stderr, "\n");
-      pass = 1;
     }
     return (TRUE);